diff options
author | Bob Badour <bbadour@google.com> | 2021-02-16 23:17:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 23:17:56 +0000 |
commit | 1947aef2511f022bd82a004e8e747db2e7f0abda (patch) | |
tree | 8f45997d0d448c9af1b8a4a7936bbf060bf1483f | |
parent | 6c7aae2652483b15cbc56c3a412dd5dcdbd6ad40 (diff) | |
parent | aec7f44f3886f1e96d72a1f8f8b1dc228abfadd3 (diff) | |
download | exoplayer-1947aef2511f022bd82a004e8e747db2e7f0abda.tar.gz |
[LSC] Add LOCAL_LICENSE_KINDS to external/exoplayer am: 5551238e47 am: 9b1f7d9e57 am: 314b3df463 am: aec7f44f38
Original change: https://android-review.googlesource.com/c/platform/external/exoplayer/+/1588862
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I291704455c919fff725997243b86b1e1714f4c1a
-rw-r--r-- | Android.bp | 17 | ||||
-rw-r--r-- | tree/extensions/ffmpeg/src/main/jni/Android.mk | 12 | ||||
-rw-r--r-- | tree/extensions/flac/src/main/jni/Android.mk | 3 | ||||
-rw-r--r-- | tree/extensions/opus/src/main/jni/Android.mk | 3 | ||||
-rw-r--r-- | tree/extensions/opus/src/main/jni/libopus.mk | 3 | ||||
-rw-r--r-- | tree/extensions/vp9/src/main/jni/Android.mk | 3 | ||||
-rw-r--r-- | tree/extensions/vp9/src/main/jni/libvpx.mk | 3 |
7 files changed, 44 insertions, 0 deletions
@@ -15,6 +15,23 @@ // // Exposes ExoPlayer classes required for implementing the MediaParser API. +package { + default_applicable_licenses: ["external_exoplayer_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "external_exoplayer_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "LICENSE", + ], +} + android_library { name: "exoplayer2-extractor", manifest: "tree/library/extractor/src/main/AndroidManifest.xml", diff --git a/tree/extensions/ffmpeg/src/main/jni/Android.mk b/tree/extensions/ffmpeg/src/main/jni/Android.mk index bcaf12cd..190a6bfa 100644 --- a/tree/extensions/ffmpeg/src/main/jni/Android.mk +++ b/tree/extensions/ffmpeg/src/main/jni/Android.mk @@ -18,21 +18,33 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libavcodec +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE LOCAL_SRC_FILES := ffmpeg/android-libs/$(TARGET_ARCH_ABI)/$(LOCAL_MODULE).so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libswresample +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE LOCAL_SRC_FILES := ffmpeg/android-libs/$(TARGET_ARCH_ABI)/$(LOCAL_MODULE).so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libavutil +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE LOCAL_SRC_FILES := ffmpeg/android-libs/$(TARGET_ARCH_ABI)/$(LOCAL_MODULE).so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := ffmpeg +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE LOCAL_SRC_FILES := ffmpeg_jni.cc LOCAL_C_INCLUDES := ffmpeg LOCAL_SHARED_LIBRARIES := libavcodec libswresample libavutil diff --git a/tree/extensions/flac/src/main/jni/Android.mk b/tree/extensions/flac/src/main/jni/Android.mk index 69520a16..16df812e 100644 --- a/tree/extensions/flac/src/main/jni/Android.mk +++ b/tree/extensions/flac/src/main/jni/Android.mk @@ -22,6 +22,9 @@ include $(WORKING_DIR)/flac_sources.mk LOCAL_PATH := $(WORKING_DIR) LOCAL_MODULE := libflacJNI +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE LOCAL_ARM_MODE := arm LOCAL_CPP_EXTENSION := .cc diff --git a/tree/extensions/opus/src/main/jni/Android.mk b/tree/extensions/opus/src/main/jni/Android.mk index 0b06d9ec..051b897c 100644 --- a/tree/extensions/opus/src/main/jni/Android.mk +++ b/tree/extensions/opus/src/main/jni/Android.mk @@ -25,6 +25,9 @@ include libopus.mk include $(CLEAR_VARS) LOCAL_PATH := $(WORKING_DIR) LOCAL_MODULE := libopusV2JNI +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE LOCAL_ARM_MODE := arm LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := opus_jni.cc diff --git a/tree/extensions/opus/src/main/jni/libopus.mk b/tree/extensions/opus/src/main/jni/libopus.mk index 672df600..abf6803f 100644 --- a/tree/extensions/opus/src/main/jni/libopus.mk +++ b/tree/extensions/opus/src/main/jni/libopus.mk @@ -26,6 +26,9 @@ include $(LOCAL_PATH)/silk_headers.mk include $(LOCAL_PATH)/silk_sources.mk LOCAL_MODULE := libopus +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE LOCAL_ARM_MODE := arm LOCAL_CFLAGS := -DOPUS_BUILD -DFIXED_POINT -DUSE_ALLOCA -DHAVE_LRINT \ -DHAVE_LRINTF diff --git a/tree/extensions/vp9/src/main/jni/Android.mk b/tree/extensions/vp9/src/main/jni/Android.mk index cb7571a1..f10120b5 100644 --- a/tree/extensions/vp9/src/main/jni/Android.mk +++ b/tree/extensions/vp9/src/main/jni/Android.mk @@ -26,6 +26,9 @@ include libvpx.mk include $(CLEAR_VARS) LOCAL_PATH := $(WORKING_DIR) LOCAL_MODULE := libvpxV2JNI +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE LOCAL_ARM_MODE := arm LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := vpx_jni.cc diff --git a/tree/extensions/vp9/src/main/jni/libvpx.mk b/tree/extensions/vp9/src/main/jni/libvpx.mk index 005f49fc..85556625 100644 --- a/tree/extensions/vp9/src/main/jni/libvpx.mk +++ b/tree/extensions/vp9/src/main/jni/libvpx.mk @@ -20,6 +20,9 @@ CONFIG_DIR := $(LOCAL_PATH)/libvpx_android_configs/$(TARGET_ARCH_ABI) libvpx_source_dir := $(LOCAL_PATH)/libvpx LOCAL_MODULE := libvpx +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../LICENSE LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_CFLAGS := -DHAVE_CONFIG_H=vpx_config.h LOCAL_ARM_MODE := arm |