StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "revert-15071196-init_first_stage_soong-GBJXQRPEKC" into sc-dev

Browse Source 
* 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"
This commit is contained in:
TreeHugger Robot
2021-07-07 03:02:00 +00:00
committed by Android (Google) Code Review
parent 69f66460de 69389a1c3a
commit 7e2e4be86c
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/Makefile
View File

@@ -815,13 +815,8 @@ endif
# We just build this directly to the install location. # We just build this directly to the install location.
INSTALLED_RAMDISK_TARGET := $(BUILT_RAMDISK_TARGET) 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) $(INSTALLED_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_RAMDISK_FILES) $(INSTALLED_FILES_FILE_RAMDISK) | $(COMPRESSION_COMMAND_DEPS)
$(call pretty,"Target ramdisk: $@") $(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) > $@ $(hide) $(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_RAMDISK_OUT) | $(COMPRESSION_COMMAND) > $@
.PHONY: ramdisk-nodeps .PHONY: ramdisk-nodeps

2
core/android_soong_config_vars.mk
View File

@@ -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,TARGET_ENABLE_MEDIADRM_64)
$(call add_soong_config_var,ANDROID,BOARD_USES_ODMIMAGE) $(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. # TODO(b/172480615): Remove when platform uses ART Module prebuilts by default.
ifeq (,$(filter art_module,$(SOONG_CONFIG_NAMESPACES))) ifeq (,$(filter art_module,$(SOONG_CONFIG_NAMESPACES)))