From dfb0b0d87759a0875d5b79c11083fc8c8dfcdaf1 Mon Sep 17 00:00:00 2001
From: Kyle Zhang <kelzhan@google.com>
Date: Tue, 17 Jan 2023 23:19:53 +0000
Subject: [PATCH] Update linker config settings

Update Widevine Apex linker config settings according to b/264330513.

Bug: 243699259
Test: atp v2/widevine-eng/drm_compliance
Change-Id: I0c7581e44dff9f8a4193ef29e68ddef42451b4f6
---
 libwvdrmengine/apex/device/Android.bp | 17 -----------------
 libwvdrmengine/apex/device/device.mk  |  4 ++--
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 libwvdrmengine/apex/device/Android.bp

diff --git a/libwvdrmengine/apex/device/Android.bp b/libwvdrmengine/apex/device/Android.bp
deleted file mode 100644
index f9b1c844..00000000
--- a/libwvdrmengine/apex/device/Android.bp
+++ /dev/null
@@ -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,
-}
diff --git a/libwvdrmengine/apex/device/device.mk b/libwvdrmengine/apex/device/device.mk
index bb830a0e..639be260 100644
--- a/libwvdrmengine/apex/device/device.mk
+++ b/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
\ No newline at end of file
+PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS += \
+	vendor/widevine/libwvdrmengine/apex/device/linker.config.json
\ No newline at end of file