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

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>

libwvdrmengine/oemcrypto/odk/Android.bp

@@ -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"],
 }
 

libwvdrmengine/oemcrypto/odk/test/fuzzing/Android.bp

@@ -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"],
 }
 

libwvdrmengine/oemcrypto/odk/test/fuzzing/corpus_generator/Android.bp

@@ -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"],
 }
 

libwvdrmengine/oemcrypto/test/Android.mk

@@ -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