diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-12-20 19:12:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 19:12:58 +0100 |
| commit | 2709113c83465f8e0e6d6e63db6032106523a9f1 (patch) | |
| tree | 760eb6f99176aebf35403a9b4a20ec54977567df /COPYRIGHT.txt | |
| parent | 3bdd1ff3875450d90f7a695aa5d527a47558d80c (diff) | |
| parent | 6770357e47b5fcc1d829e0890a3140c91be16872 (diff) | |
Merge pull request #24499 from akien-mga/android-thirdparty
Android: Better identify thirdparty C/C++ code
Diffstat (limited to 'COPYRIGHT.txt')
| -rw-r--r-- | COPYRIGHT.txt | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 2a1fe20477..738fe3ff5a 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -55,31 +55,16 @@ Comment: Godot Engine logo Copyright: 2017, Andrea Calabró License: CC-BY-3.0 -Files: ./platform/android/android_native_app_glue.c - ./platform/android/android_native_app_glue.h - ./platform/android/java/aidl/com/android/vending/billing/IInAppBillingService.aidl +Files: ./platform/android/java/aidl/com/android/vending/billing/IInAppBillingService.aidl ./platform/android/java/res/layout/status_bar_ongoing_event_progress_bar.xml - ./platform/android/java/src/com/android/vending/licensing/* ./platform/android/java/src/com/google/android/vending/expansion/downloader/* + ./platform/android/java/src/com/google/android/vending/licensing/* ./platform/android/java/src/org/godotengine/godot/input/InputManagerCompat.java ./platform/android/java/src/org/godotengine/godot/input/InputManagerV16.java - ./platform/android/java/src/org/godotengine/godot/input/InputManagerV9.java Comment: The Android Open Source Project Copyright: 2008-2013, The Android Open Source Project License: Apache-2.0 -Files: ./platform/android/cpu-features.c - ./platform/android/cpu-features.h -Comment: The Android Open Source Project -Copyright: 2010, The Android Open Source Project -License: BSD-2-clause - -Files: ./platform/android/ifaddrs_android.cpp - ./platform/android/ifaddrs_android.h -Comment: The Android Open Source Project -Copyright: 2012-2013, Google Inc. -License: BSD-3-clause - Files: ./platform/android/java/src/com/android/vending/licensing/util/Base64.java ./platform/android/java/src/com/android/vending/licensing/util/Base64DecoderException.java Comment: The Android Open Source Project @@ -225,6 +210,12 @@ Comment: The WebM Project Copyright: 2010, The WebM Project authors. License: BSD-3-clause +Files: ./thirdparty/libvpx/third_party/android/cpu-features.c + ./thirdparty/libvpx/third_party/android/cpu-features.h +Comment: The Android Open Source Project +Copyright: 2010, The Android Open Source Project +License: BSD-2-clause + Files: ./thirdparty/libwebp/ Comment: WebP codec Copyright: 2010, Google Inc. @@ -295,6 +286,12 @@ Comment: hq2x implementation Copyright: 2016, Bruno Ribeiro License: Apache-2.0 +Files: ./thirdparty/misc/ifaddrs-android.cc + ./thirdparty/misc/ifaddrs-android.h +Comment: libjingle +Copyright: 2012-2013, Google Inc. +License: BSD-3-clause + Files: ./thirdparty/misc/md5.cpp ./thirdparty/misc/md5.h Comment: MD5 Message Digest Algorithm |