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

Commit 35354dc7 authored by Eric Fischer's avatar Eric Fischer Committed by The Android Open Source Project
Browse files

Automated import from //branches/donutburger/...@142719,142719

parent 0ccf0ad4

core/cleanbuild.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

core/dynamic_binary.mk

+9 −1
Original line number Diff line number Diff line
@@ -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

core/prelink-linux-arm.map

+1 −1
Original line number Diff line number Diff line
@@ -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