diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-17 22:37:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-17 22:37:56 +0000 |
| commit | 68c7869e86faaf8a7053e45892e65e3eb0d0e863 (patch) | |
| tree | 2059eb04a4cf2be251c69694cbf4d115bb8c74ab | |
| parent | a8934ddc26b46213f205eaaf2131f940d693282b (diff) | |
| parent | 12c64a758663cfecce7f71fcad960d94b4e04e58 (diff) | |
| download | core-68c7869e86faaf8a7053e45892e65e3eb0d0e863.tar.gz | |
Merge "Don't install Android-only dependencies to microdroid" into main
| -rw-r--r-- | init/Android.bp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/init/Android.bp b/init/Android.bp index ff82f7f18..6d63e41e2 100644 --- a/init/Android.bp +++ b/init/Android.bp @@ -259,6 +259,7 @@ cc_library_static { "avf_build_flags_cc", "libinit_defaults", ], + recovery_available: false, cflags: ["-DMICRODROID=1"], } @@ -276,6 +277,13 @@ cc_defaults { defaults: ["init_defaults"], srcs: ["main.cpp"], symlinks: ["ueventd"], +} + +cc_binary { + name: "init_second_stage", + defaults: ["init_second_stage_defaults"], + static_libs: ["libinit"], + visibility: ["//visibility:any_system_partition"], target: { platform: { required: [ @@ -310,18 +318,12 @@ cc_defaults { } cc_binary { - name: "init_second_stage", - defaults: ["init_second_stage_defaults"], - static_libs: ["libinit"], - visibility: ["//visibility:any_system_partition"], -} - -cc_binary { name: "init_second_stage.microdroid", defaults: [ "avf_build_flags_cc", "init_second_stage_defaults", ], + recovery_available: false, static_libs: ["libinit.microdroid"], cflags: ["-DMICRODROID=1"], installable: false, |