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

Commit bc134621 authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by android-build-merger
Browse files

Merge "Fix potential build break" into oc-mr1-dev 

am: 9d96622b

Change-Id: I546c4dc1d74917ddfa2b74f8876160ecf4a9956a
parents f6b3316b 9d96622b

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



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