commit c4707d947346a32483f2f3f9d798b577b4647891
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Nov 11 01:49:46 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 11 01:49:46 2024 +0000
tree 94aa2025e26877ccdf99bfbc595c9f6d6ce7f3da
parent 639034dcc6d4d7357d565bfd6eab1bc14e49b072
parent 0c357c9947134c1e4705ea7eb86b3a696f549d87

Merge "Update linker configuration for generic_system_image" into main

target/product/generic/Android.bp

diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp
index cf8f5a7..a142f37 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -348,7 +348,10 @@
     dirs: android_rootdirs,
     symlinks: android_symlinks,
     file_contexts: ":plat_file_contexts",
-    linker_config_src: ":system_linker_config_json_file",
+    linkerconfig: {
+        gen_linker_config: true,
+        linker_config_srcs: [":system_linker_config_json_file"],
+    },
     fsverity: {
         inputs: [
             "etc/boot-image.prof",