Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e2e4be8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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"
parents 69f66460 69389a1c

core/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -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

core/android_soong_config_vars.mk

+0 −2
Original line number Diff line number Diff line
@@ -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)))