Merge "Fix potential build break" into oc-mr1-dev (9d96622b) · Commits · e / os / android_build

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

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