summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-16 21:45:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-16 21:45:54 +0000
commit9b1f7d9e574274d81a781b47bb440a9d19a73f66 (patch)
treefbdebbbdecdc99e21aca2ecaa18935d84259bec3
parent908cc7dc04061b864308766c39ad2ff40783468b (diff)
parent5551238e474751b052a4a4557b56daa4f0dae749 (diff)
downloadplatform_external_exoplayer-android-s-beta-4.tar.gz
platform_external_exoplayer-android-s-beta-4.tar.bz2
platform_external_exoplayer-android-s-beta-4.zip
[LSC] Add LOCAL_LICENSE_KINDS to external/exoplayer am: 5551238e47android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/exoplayer/+/1588862 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I233745cdd7c8430e5be5a5535f36cf26c2d6bf6f
-rw-r--r--Android.bp17
-rw-r--r--tree/extensions/ffmpeg/src/main/jni/Android.mk12
-rw-r--r--tree/extensions/flac/src/main/jni/Android.mk3
-rw-r--r--tree/extensions/opus/src/main/jni/Android.mk3
-rw-r--r--tree/extensions/opus/src/main/jni/libopus.mk3
-rw-r--r--tree/extensions/vp9/src/main/jni/Android.mk3
-rw-r--r--tree/extensions/vp9/src/main/jni/libvpx.mk3
7 files changed, 44 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 9ecbda7..ae4e3d5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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 bcaf12c..190a6bf 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 69520a1..16df812 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 0b06d9e..051b897 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 672df60..abf6803 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 cb7571a..f10120b 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 005f49f..8555662 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