widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleanup vendor projects are proprietary." into tm-qpr-dev-plus-aosp am: cbb6177df2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21276850

Change-Id: I7ba871f7714ba4eb5dcb5b0571b6024533a25217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bob Badour
2023-02-05 03:54:39 +00:00
committed by Automerger Merge Worker
parent 16e4fb594a cbb6177df2
commit 080bfc7414
21 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -40,6 +40,7 @@ license {
license_kinds: [
"SPDX-license-identifier-Apache-2.0",
"legacy_by_exception_only", // by exception only
"legacy_proprietary", // by exception only
],
// large-scale-change unable to identify any license_text files
}

1
libwvdrmengine/Android.bp
View File

@@ -51,6 +51,7 @@ package {
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// legacy_by_exception_only (by exception only)
// legacy_proprietary (by exception only)
default_applicable_licenses: ["vendor_widevine_license"],
}

1
libwvdrmengine/cdm/Android.bp
View File

@@ -11,6 +11,7 @@ package {
// all of the 'license_kinds' from "vendor_widevine_license"
// to get the below license kinds:
// legacy_by_exception_only (by exception only)
// legacy_proprietary (by exception only)
default_applicable_licenses: ["vendor_widevine_license"],
}

1
libwvdrmengine/cdm/core/src/Android.bp
View File

@@ -8,6 +8,7 @@ package {
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// legacy_by_exception_only (by exception only)
// legacy_proprietary (by exception only)
default_applicable_licenses: ["vendor_widevine_license"],
}

1
libwvdrmengine/cdm/core/test/Android.bp
View File

@@ -22,6 +22,7 @@ package {
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// legacy_by_exception_only (by exception only)
// legacy_proprietary (by exception only)
default_applicable_licenses: ["vendor_widevine_license"],
}

1
libwvdrmengine/cdm/metrics/src/Android.bp
View File

@@ -22,6 +22,7 @@ package {
// all of the 'license_kinds' from "vendor_widevine_license"
// to get the below license kinds:
// legacy_by_exception_only (by exception only)
// legacy_proprietary (by exception only)
default_applicable_licenses: ["vendor_widevine_license"],
}

1
libwvdrmengine/level3/Android.bp
View File

@@ -21,6 +21,7 @@ package {
// all of the 'license_kinds' from "vendor_widevine_license"
// to get the below license kinds:
// legacy_by_exception_only (by exception only)
// legacy_proprietary (by exception only)
default_applicable_licenses: ["vendor_widevine_license"],
}

1
libwvdrmengine/mediacrypto/Android.bp
View File

@@ -19,6 +19,7 @@
package {
// See: http://go/android-license-faq
// legacy_by_exception_only (by exception only)
// legacy_proprietary (by exception only)
default_applicable_licenses: ["vendor_widevine_license"],
}

4
libwvdrmengine/mediacrypto/test/Android.mk
View File

@@ -50,8 +50,8 @@ LOCAL_C_INCLUDES += \
external/protobuf/src \
LOCAL_MODULE := libwvdrmmediacrypto_hal_test
LOCAL_LICENSE_KINDS := legacy_by_exception_only
LOCAL_LICENSE_CONDITIONS := by_exception_only
LOCAL_LICENSE_KINDS := legacy_by_exception_only legacy_proprietary
LOCAL_LICENSE_CONDITIONS := by_exception_only proprietary by_exception_only
LOCAL_MODULE_TAGS := tests

1
libwvdrmengine/mediadrm/Android.bp
View File

@@ -19,6 +19,7 @@
package {
// See: http://go/android-license-faq
// legacy_by_exception_only (by exception only)
// legacy_proprietary (by exception only)
default_applicable_licenses: ["vendor_widevine_license"],
}

8
libwvdrmengine/mediadrm/test/Android.mk
View File

@@ -50,8 +50,8 @@ LOCAL_C_INCLUDES += \
external/protobuf/src \
LOCAL_MODULE := libwvdrmdrmplugin_hal_test
LOCAL_LICENSE_KINDS := legacy_by_exception_only
LOCAL_LICENSE_CONDITIONS := by_exception_only
LOCAL_LICENSE_KINDS := legacy_by_exception_only legacy_proprietary
LOCAL_LICENSE_CONDITIONS := by_exception_only proprietary by_exception_only
LOCAL_MODULE_TAGS := tests
@@ -106,8 +106,8 @@ LOCAL_C_INCLUDES += \
external/protobuf/src \
LOCAL_MODULE := hal_metrics_adapter_unittest
LOCAL_LICENSE_KINDS := legacy_by_exception_only
LOCAL_LICENSE_CONDITIONS := by_exception_only
LOCAL_LICENSE_KINDS := legacy_by_exception_only legacy_proprietary
LOCAL_LICENSE_CONDITIONS := by_exception_only proprietary by_exception_only
LOCAL_MODULE_TAGS := tests

1
libwvdrmengine/oemcrypto/odk/Android.bp
View File

@@ -14,6 +14,7 @@ package {
// all of the 'license_kinds' from "vendor_widevine_license"
// to get the below license kinds:
// legacy_by_exception_only (by exception only)
// legacy_proprietary (by exception only)
default_applicable_licenses: ["vendor_widevine_license"],
}

1
libwvdrmengine/oemcrypto/odk/test/fuzzing/Android.bp
View File

@@ -11,6 +11,7 @@ package {
// all of the 'license_kinds' from "vendor_widevine_license"
// to get the below license kinds:
// legacy_by_exception_only (by exception only)
// legacy_proprietary (by exception only)
default_applicable_licenses: ["vendor_widevine_license"],
}

1
libwvdrmengine/oemcrypto/odk/test/fuzzing/corpus_generator/Android.bp
View File

@@ -18,6 +18,7 @@ package {
// all of the 'license_kinds' from "vendor_widevine_license"
// to get the below license kinds:
// legacy_by_exception_only (by exception only)
// legacy_proprietary (by exception only)
default_applicable_licenses: ["vendor_widevine_license"],
}

4
libwvdrmengine/oemcrypto/test/Android.mk
View File

@@ -6,8 +6,8 @@ LOCAL_C_INCLUDES := \
vendor/widevine/libwvdrmengine/cdm/util/include \
LOCAL_MODULE:=oemcrypto_test
LOCAL_LICENSE_KINDS:=legacy_by_exception_only
LOCAL_LICENSE_CONDITIONS:=by_exception_only
LOCAL_LICENSE_KINDS:=legacy_by_exception_only legacy_proprietary
LOCAL_LICENSE_CONDITIONS:=by_exception_only proprietary by_exception_only
LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_OWNER := widevine

4
libwvdrmengine/test/castv2/Android.mk
View File

@@ -13,8 +13,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := com.android.mediadrm.signer org.apache.http.legacy
LOCAL_PACKAGE_NAME := CastSignAPITest
LOCAL_LICENSE_KINDS := legacy_by_exception_only
LOCAL_LICENSE_CONDITIONS := by_exception_only
LOCAL_LICENSE_KINDS := legacy_by_exception_only legacy_proprietary
LOCAL_LICENSE_CONDITIONS := by_exception_only proprietary by_exception_only
LOCAL_PRIVATE_PLATFORM_APIS := true
# Disable dexpreopt and <uses-library> check for test.

4
libwvdrmengine/test/java/MediaDrmApiTest/Android.mk
View File

@@ -6,8 +6,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := MediaDrmAPITest
LOCAL_LICENSE_KINDS := legacy_by_exception_only
LOCAL_LICENSE_CONDITIONS := by_exception_only
LOCAL_LICENSE_KINDS := legacy_by_exception_only legacy_proprietary
LOCAL_LICENSE_CONDITIONS := by_exception_only proprietary by_exception_only
LOCAL_JAVA_LIBRARIES := org.apache.http.legacy

4
libwvdrmengine/test/unit/Android.mk
View File

@@ -37,8 +37,8 @@ LOCAL_HEADER_LIBRARIES := \
LOCAL_MODULE := libwvdrmengine_hal_test
LOCAL_LICENSE_KINDS := legacy_by_exception_only
LOCAL_LICENSE_CONDITIONS := by_exception_only
LOCAL_LICENSE_KINDS := legacy_by_exception_only legacy_proprietary
LOCAL_LICENSE_CONDITIONS := by_exception_only proprietary by_exception_only
LOCAL_MODULE_TAGS := tests

1
libwvdrmengine/tools/factory_upload_tool/Android.bp
View File

@@ -5,6 +5,7 @@ package {
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// legacy_by_exception_only (by exception only)
// legacy_proprietary (by exception only)
default_applicable_licenses: ["vendor_widevine_license"],
}

1
libwvdrmengine/tools/metrics_dump/Android.bp
View File

@@ -21,6 +21,7 @@ package {
// all of the 'license_kinds' from "vendor_widevine_license"
// to get the below license kinds:
// legacy_by_exception_only (by exception only)
// legacy_proprietary (by exception only)
default_applicable_licenses: ["vendor_widevine_license"],
}

1
libwvdrmengine/vts/vendor_module/Android.bp
View File

@@ -26,6 +26,7 @@ package {
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// legacy_by_exception_only (by exception only)
// legacy_proprietary (by exception only)
default_applicable_licenses: ["vendor_widevine_license"],
}