commit cabb4bf750be1771d17567eedf4dfb68f1c01cc2
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Sep 13 03:56:03 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 13 03:56:03 2024 +0000
tree 9711efa503b67113d740c8728256aa877c4b1d90
parent c169f4dc9a8fb240c65f32ab052a67bce1bc61be
parent 460eda048a51d3b6321e1918124bfadc2965767c

Merge "Define linker.config.json as a filegroup" into main am: 511a1733ec am: 460eda048a

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3261856

Change-Id: I4424aa237d855d66bc4f33b413bd60905af9be4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

rootdir/Android.bp

diff --git a/rootdir/Android.bp b/rootdir/Android.bp
index 5f0a2c3..44acbba 100644
--- a/rootdir/Android.bp
+++ b/rootdir/Android.bp
@@ -50,10 +50,15 @@
     recovery_available: true,
 }
 
+filegroup {
+    name: "system_linker_config_json_file",
+    srcs: ["etc/linker.config.json"],
+}
+
 // TODO(b/147210213) Generate list of libraries during build and fill in at build time
 linker_config {
     name: "system_linker_config",
-    src: "etc/linker.config.json",
+    src: ":system_linker_config_json_file",
     installable: false,
 }