Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 4f242a6..e47ba71 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -47,6 +47,7 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libmediaplayerservice_intermediates)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libmedia_jni_intermediates)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright_omx_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/core/Makefile b/core/Makefile
index 3e7526c..7547648 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -46,8 +46,8 @@
$(hide) echo "#" > $@; \
echo "# ADDITIONAL_DEFAULT_PROPERTIES" >> $@; \
echo "#" >> $@;
- $(hide) echo $(ADDITIONAL_DEFAULT_PROPERTIES) | sed 's/ \([^ ]*=\)/\n\1/g' >> $@;
- $(hide) echo >> $@
+ $(hide) $(foreach line,$(ADDITIONAL_DEFAULT_PROPERTIES), \
+ echo "$(line)" >> $@;)
# -----------------------------------------------------------------
# build.prop
@@ -146,8 +146,8 @@
echo "#" >> $@; \
echo "# ADDITIONAL_BUILD_PROPERTIES" >> $@; \
echo "#" >> $@; )
- $(hide) echo $(ADDITIONAL_BUILD_PROPERTIES) | sed 's/ \([^ ]*=\)/\n\1/g' >> $@;
- $(hide) echo >> $@
+ $(hide) $(foreach line,$(ADDITIONAL_BUILD_PROPERTIES), \
+ echo "$(line)" >> $@;)
build_desc :=
diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk
index 0818d87..cfbe740 100644
--- a/core/dynamic_binary.mk
+++ b/core/dynamic_binary.mk
@@ -14,7 +14,12 @@
LOCAL_UNSTRIPPED_PATH := $(strip $(LOCAL_UNSTRIPPED_PATH))
ifeq ($(LOCAL_UNSTRIPPED_PATH),)
- LOCAL_UNSTRIPPED_PATH := $(TARGET_OUT_$(LOCAL_MODULE_CLASS)_UNSTRIPPED)
+ ifeq ($(LOCAL_MODULE_PATH),)
+ LOCAL_UNSTRIPPED_PATH := $(TARGET_OUT_$(LOCAL_MODULE_CLASS)_UNSTRIPPED)
+ else
+ # We have to figure out the corresponding unstripped path if LOCAL_MODULE_PATH is customized.
+ LOCAL_UNSTRIPPED_PATH := $(TARGET_OUT_UNSTRIPPED)/$(patsubst $(PRODUCT_OUT)/%,%,$(LOCAL_MODULE_PATH))
+ endif
endif
# The name of the target file, without any path prepended.