diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-18 09:02:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-18 09:02:26 +0000 |
| commit | cf10185df64f5ac491ded82aec346ce55e6f7f2e (patch) | |
| tree | 6251e7aedc5c7337b9389723fac7adbee7490f19 | |
| parent | bb791bc97e023d9bfce9c3074389b18f7c1ab830 (diff) | |
| parent | edfd1d45853e055078c6dd3223a62b1c79c1c287 (diff) | |
Merge "Revert "Fix non-existent module error"" am: d7cb6e1fd0 am: cb54d93584 am: 416b9395fc am: 9e74768cde am: edfd1d4585
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1398410
Change-Id: I4ec01801036051718a9665deb2be7b5015f7da17
| -rw-r--r-- | init/Android.mk | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/init/Android.mk b/init/Android.mk index 2fbbf4af7..da94daf44 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -119,13 +119,6 @@ LOCAL_SANITIZE := signed-integer-overflow # First stage init is weird: it may start without stdout/stderr, and no /proc. LOCAL_NOSANITIZE := hwaddress include $(BUILD_EXECUTABLE) - -# LOCAL_FORCE_STATIC_EXECUTABLE targets are skipped and not defined for ASAN builds -init_vendor_deps := -ifneq (true,$(my_skip_this_target)) - init_vendor_deps += init_first_stage -endif # my_skip_this_target is true - endif include $(CLEAR_VARS) @@ -140,7 +133,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := init_vendor ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true) -LOCAL_REQUIRED_MODULES := $(init_vendor_deps) +LOCAL_REQUIRED_MODULES := \ + init_first_stage \ + endif include $(BUILD_PHONY_PACKAGE) -init_vendor_deps := |