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

Commit 389d81d1 authored by Inseob Kim's avatar Inseob Kim Committed by Gerrit Code Review
Browse files

Merge changes from topic "init_first_stage_soong" 

* changes:
  Add BUILD_USES_RECOVERY_AS_BOOT to soong config
  Directly create ramdisk dirs in ramdisk image rule
  Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
parents 97b0ada6 b8e27409

core/Makefile

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

core/android_soong_config_vars.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,8 @@ $(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)))