| commit | 6ec6f7468212d072ed5e23e05b75805603f14256 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Nov 12 01:55:07 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 12 01:55:07 2024 +0000 |
| tree | 948d48dde21e4a4db297ad89c8a45d6e858c030b | |
| parent | 81869563100cc755f81da4097cafe9d5415a295c [diff] | |
| parent | 829c89ac25345fb4f4e936f9511073ec03029421 [diff] |
Merge "Rename linkerconfig to linker_config" into main am: 829c89ac25 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3344321 Change-Id: I7cfe747bc7cc18e20b4d161af5b4c44a0042734e 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"], },