diff options
| -rw-r--r-- | core/cleanbuild.mk | 2 | ||||
| -rw-r--r-- | core/dynamic_binary.mk | 10 | ||||
| -rw-r--r-- | core/prelink-linux-arm.map | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/core/cleanbuild.mk b/core/cleanbuild.mk index 50b56f9..a753554 100644 --- a/core/cleanbuild.mk +++ b/core/cleanbuild.mk @@ -169,11 +169,13 @@ installclean_files := \ ./$(PRODUCT_OUT)/*.xlb \ ./$(PRODUCT_OUT)/*.zip \ ./$(PRODUCT_OUT)/data \ + ./$(PRODUCT_OUT)/obj/lib \ ./$(PRODUCT_OUT)/obj/APPS \ ./$(PRODUCT_OUT)/obj/NOTICE_FILES \ ./$(PRODUCT_OUT)/obj/PACKAGING \ ./$(PRODUCT_OUT)/recovery \ ./$(PRODUCT_OUT)/root \ + ./$(PRODUCT_OUT)/symbols/system/lib \ ./$(PRODUCT_OUT)/system # The files/dirs to delete during a dataclean, which removes any files diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk index 10027b8..f07cf2a 100644 --- a/core/dynamic_binary.mk +++ b/core/dynamic_binary.mk @@ -18,7 +18,15 @@ ifeq ($(LOCAL_UNSTRIPPED_PATH),) endif # The name of the target file, without any path prepended. -LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) +# TODO: This duplicates logic from base_rules.mk because we need to +# know its results before base_rules.mk is included. +# Consolidate the duplicates. +LOCAL_MODULE_STEM := $(strip $(LOCAL_MODULE_STEM)) +ifeq ($(LOCAL_MODULE_STEM),) + LOCAL_MODULE_STEM := $(LOCAL_MODULE) +endif +LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE_STEM)$(LOCAL_MODULE_SUFFIX) +LOCAL_BUILT_MODULE_STEM := $(LOCAL_INSTALLED_MODULE_STEM) # base_rules.make defines $(intermediates), but we need its value # before we include base_rules. Make a guess, and verify that diff --git a/core/prelink-linux-arm.map b/core/prelink-linux-arm.map index 429ae1a..1cd2aa4 100644 --- a/core/prelink-linux-arm.map +++ b/core/prelink-linux-arm.map @@ -39,7 +39,7 @@ libnetutils.so 0xADB00000 # core dalvik runtime support libandroid_servers.so 0xAD900000 -libicudata.so 0xAD600000 +#libicudata.so 0xAD600000 libicuuc.so 0xAD500000 libicui18n.so 0xAD400000 libandroid_runtime.so 0xAD300000 |