openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge changes I9c735fe2,Ib918b2ed 

am: b51df6d171

Change-Id: I8b96c237e92fe3c8f4c8e74c2054ea2ed0ff2e45
This commit is contained in:
Dan Willemsen 2016-08-01 23:25:29 +00:00 committed by android-build-merger
parent 644526cfa5 b51df6d171
commit 6d037230b8
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/cleanbuild.mk
View File

@ -152,16 +152,12 @@ endif # if not ONE_SHOT_MAKEFILE dont_bother
previous_build_config_file := $(PRODUCT_OUT)/previous_build_config.mk previous_build_config_file := $(PRODUCT_OUT)/previous_build_config.mk
# A change in the list of aapt configs warrants an installclean, too.
aapt_config_list := $(strip $(PRODUCT_AAPT_CONFIG) $(PRODUCT_AAPT_PREF_CONFIG))
current_build_config := \ current_build_config := \
$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)-{$(aapt_config_list)} $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)
current_sanitize_target := $(strip $(SANITIZE_TARGET)) current_sanitize_target := $(strip $(SANITIZE_TARGET))
ifeq (,$(current_sanitize_target)) ifeq (,$(current_sanitize_target))
current_sanitize_target := false current_sanitize_target := false
endif endif
aapt_config_list :=
force_installclean := false force_installclean := false
force_objclean := false force_objclean := false
@ -236,7 +232,6 @@ installclean_files := \
$(PRODUCT_OUT)/kernel \ $(PRODUCT_OUT)/kernel \
$(PRODUCT_OUT)/data \ $(PRODUCT_OUT)/data \
$(PRODUCT_OUT)/skin \ $(PRODUCT_OUT)/skin \
$(PRODUCT_OUT)/obj/APPS \
$(PRODUCT_OUT)/obj/NOTICE_FILES \ $(PRODUCT_OUT)/obj/NOTICE_FILES \
$(PRODUCT_OUT)/obj/PACKAGING \ $(PRODUCT_OUT)/obj/PACKAGING \
$(PRODUCT_OUT)/recovery \ $(PRODUCT_OUT)/recovery \
@ -244,8 +239,6 @@ installclean_files := \
$(PRODUCT_OUT)/system \ $(PRODUCT_OUT)/system \
$(PRODUCT_OUT)/vendor \ $(PRODUCT_OUT)/vendor \
$(PRODUCT_OUT)/oem \ $(PRODUCT_OUT)/oem \
$(PRODUCT_OUT)/dex_bootjars \
$(PRODUCT_OUT)/obj/JAVA_LIBRARIES \
$(PRODUCT_OUT)/obj/FAKE $(PRODUCT_OUT)/obj/FAKE
# The files/dirs to delete during a dataclean, which removes any files # The files/dirs to delete during a dataclean, which removes any files