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

Commit b260f0d5 authored by Hung-ying Tyan's avatar Hung-ying Tyan
Browse files

Fix potential build break 

When BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED is enabled, the build system
may attempt to create a symlink in TARGET_ROOT_OUT before TARGET_ROOT_OUT
is created. Also make the symbolic link depend on
INSTALLED_DEFAULT_PROP_TARGET so that the symbolic link is properly created
when only bootimage is made.

Bug: 63645797
Test: on non-A/B device, make installclean && make bootimag and then verify
      that the symbolic link exists at $(TARGET_ROOT_OUT)/default.prop
Change-Id: Ied7b32abd7a5fd5456c4cb5ff68a56debe6254b7
(cherry picked from 58c1b042)
parent d463548a

core/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ endif 
# prop.default

ifdef property_overrides_split_enabled

INSTALLED_DEFAULT_PROP_TARGET := $(TARGET_OUT)/etc/prop.default

INSTALLED_DEFAULT_PROP_OLD_TARGET := $(TARGET_ROOT_OUT)/default.prop

ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_DEFAULT_PROP_OLD_TARGET)

$(INSTALLED_DEFAULT_PROP_OLD_TARGET): $(INSTALLED_DEFAULT_PROP_TARGET)

else

# legacy path

INSTALLED_DEFAULT_PROP_TARGET := $(TARGET_ROOT_OUT)/default.prop
@@ -115,7 +118,7 @@ $(INSTALLED_DEFAULT_PROP_TARGET): $(intermediate_system_build_prop) 
	$(hide) build/tools/post_process_props.py $@

ifdef property_overrides_split_enabled

	$(hide) mkdir -p $(TARGET_ROOT_OUT)

	$(hide) ln -sf system/etc/prop.default $(TARGET_ROOT_OUT)/default.prop

	$(hide) ln -sf system/etc/prop.default $(INSTALLED_DEFAULT_PROP_OLD_TARGET)

endif



# -----------------------------------------------------------------