diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-07-07 03:02:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-07-07 03:02:00 +0000 |
| commit | 7e2e4be86c9f32f6bd93fbc9e1489a970f9cdd88 (patch) | |
| tree | 3a7c2389506caafb4b1216db00ce4d6108356c61 | |
| parent | 69f66460deeef65f4120c0c05ac6a4c23d0af088 (diff) | |
| parent | 69389a1c3a0e7809c11d0303a36ec288d0369c5b (diff) | |
| download | build-7e2e4be86c9f32f6bd93fbc9e1489a970f9cdd88.tar.gz | |
Merge changes from topic "revert-15071196-init_first_stage_soong-GBJXQRPEKC" into sc-dev
* changes:
Revert "Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars"
Revert "Directly create ramdisk dirs in ramdisk image rule"
Revert "Add BUILD_USES_RECOVERY_AS_BOOT to soong config"
| -rw-r--r-- | core/Makefile | 5 | ||||
| -rw-r--r-- | core/android_soong_config_vars.mk | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/core/Makefile b/core/Makefile index cc5d86892c..28edc8714b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -815,13 +815,8 @@ endif # We just build this directly to the install location. INSTALLED_RAMDISK_TARGET := $(BUILT_RAMDISK_TARGET) -$(INSTALLED_RAMDISK_TARGET): PRIVATE_DIRS := debug_ramdisk dev metadata mnt proc second_stage_resources sys $(INSTALLED_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_RAMDISK_FILES) $(INSTALLED_FILES_FILE_RAMDISK) | $(COMPRESSION_COMMAND_DEPS) $(call pretty,"Target ramdisk: $@") - $(hide) mkdir -p $(addprefix $(TARGET_RAMDISK_OUT)/,$(PRIVATE_DIRS)) -ifeq (true,$(BOARD_USES_GENERIC_KERNEL_IMAGE)) - $(hide) mkdir -p $(addprefix $(TARGET_RAMDISK_OUT)/first_stage_ramdisk/,$(PRIVATE_DIRS)) -endif $(hide) $(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_RAMDISK_OUT) | $(COMPRESSION_COMMAND) > $@ .PHONY: ramdisk-nodeps diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 04a055dca8..43d1aada94 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -28,8 +28,6 @@ $(call add_soong_config_namespace,ANDROID) $(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64) $(call add_soong_config_var,ANDROID,BOARD_USES_ODMIMAGE) -$(call add_soong_config_var,ANDROID,BOARD_USES_RECOVERY_AS_BOOT) -$(call add_soong_config_var,ANDROID,BOARD_BUILD_SYSTEM_ROOT_IMAGE) # TODO(b/172480615): Remove when platform uses ART Module prebuilts by default. ifeq (,$(filter art_module,$(SOONG_CONFIG_NAMESPACES))) |