From c9a49c1e4221da8ee408d547f319cb1976eef27c Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Thu, 15 Oct 2020 17:19:52 +0200
Subject: linker: Convert lineage product variables to soong config variables

Change-Id: I3b21f8ff0552761cc75a70d4538051d837aa1586
---
 linker/Android.bp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/linker/Android.bp b/linker/Android.bp
index 5f8367ee9..582a9e41e 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -57,6 +57,10 @@ cc_object {
 // Configuration for the linker binary and any of its static libraries.
 cc_defaults {
     name: "linker_defaults",
+    defaults: [
+        "process_sdk_version_overrides_defaults",
+        "shim_libs_defaults",
+    ],
     arch: {
         arm: {
             cflags: ["-D__work_around_b_24465209__"],
@@ -91,14 +95,6 @@ cc_defaults {
         debuggable: {
             cppflags: ["-DUSE_LD_CONFIG_FILE"],
         },
-        lineage: {
-            target_process_sdk_version_override: {
-                cppflags: ["-DSDK_VERSION_OVERRIDES=\"%s\""],
-            },
-            target_shim_libs: {
-                cppflags: ["-DLD_SHIM_LIBS=\"%s\""],
-            },
-        },
     },
 
     cppflags: ["-Wold-style-cast"],
-- 
cgit v1.2.3