commit | 1bc957aab7a95139a9679b70183770dee7059eaf | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Nov 12 02:26:07 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 12 02:26:07 2024 +0000 |
tree | 73b23af6a85144b9e69b33db3378b67e56224c83 | |
parent | e98f5903840eb8783225cf3805d650a889fff394 [diff] | |
parent | 6ec6f7468212d072ed5e23e05b75805603f14256 [diff] |
Merge "Rename linkerconfig to linker_config" into main am: 829c89ac25 am: 6ec6f74682 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3344321 Change-Id: I1941980ea763038bb779bf185bbd5f18f7225290 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/build/microdroid/Android.bp b/build/microdroid/Android.bp index d9e39f0..7f23ae6 100644 --- a/build/microdroid/Android.bp +++ b/build/microdroid/Android.bp
@@ -139,7 +139,7 @@ ], }, }, - linkerconfig: { + linker_config: { gen_linker_config: true, linker_config_srcs: ["linker.config.json"], },