Merge "Update linker config settings"

libwvdrmengine/apex/device/Android.bp

@@ -1,17 +0,0 @@
-// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
-//     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
-//     DEPENDING ON IT IN YOUR PROJECT. ***
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "vendor_widevine_license"
-    // to get the below license kinds:
-    //   legacy_by_exception_only (by exception only)
-    default_applicable_licenses: ["vendor_widevine_license"],
-}
-
-linker_config {
-    name: "widevine_linker_config",
-    src: "linker.config.json",
-    vendor: true,
-}

libwvdrmengine/apex/device/device.mk

@@ -6,5 +6,5 @@ ifneq ($(wildcard vendor/google/dev-keystore),)
 $(call soong_config_set,widevine,use_devkey,true)
 endif
 
-PRODUCT_PACKAGES += \
-	widevine_linker_config
+PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS += \
+	vendor/widevine/libwvdrmengine/apex/device/linker.config.json