summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuK1337 <priv.luk@gmail.com>2020-10-15 17:19:52 +0200
committerMichael Bestas <mkbestas@lineageos.org>2020-12-08 17:39:59 +0200
commitc9a49c1e4221da8ee408d547f319cb1976eef27c (patch)
tree052fa6d63048f816b2ba4d6e5132a1ec5d89464b
parent519a618d250311d264fc4fd4df06811900b751c1 (diff)
linker: Convert lineage product variables to soong config variables
Change-Id: I3b21f8ff0552761cc75a70d4538051d837aa1586
-rw-r--r--linker/Android.bp12
1 files 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"],