StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I9c735fe2,Ib918b2ed

Browse Source 
* changes:
  Don't clean obj/{APPS,JAVA_LIBRARIES} during installclean
  Disable auto installclean for AAPT config change
This commit is contained in:
Treehugger Robot
2016-08-01 23:07:52 +00:00
committed by Gerrit Code Review
parent 240faf5ef0 84f4f3b7df
commit b51df6d171
1 changed files with 1 additions and 8 deletions
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
# 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 := \
$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)-{$(aapt_config_list)}
$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)
current_sanitize_target := $(strip $(SANITIZE_TARGET))
ifeq (,$(current_sanitize_target))
current_sanitize_target := false
endif
aapt_config_list :=
force_installclean := false
force_objclean := false
@@ -236,7 +232,6 @@ installclean_files := \
$(PRODUCT_OUT)/kernel \
$(PRODUCT_OUT)/data \
$(PRODUCT_OUT)/skin \
$(PRODUCT_OUT)/obj/APPS \
$(PRODUCT_OUT)/obj/NOTICE_FILES \
$(PRODUCT_OUT)/obj/PACKAGING \
$(PRODUCT_OUT)/recovery \
@@ -244,8 +239,6 @@ installclean_files := \
$(PRODUCT_OUT)/system \
$(PRODUCT_OUT)/vendor \
$(PRODUCT_OUT)/oem \
$(PRODUCT_OUT)/dex_bootjars \
$(PRODUCT_OUT)/obj/JAVA_LIBRARIES \
$(PRODUCT_OUT)/obj/FAKE
# The files/dirs to delete during a dataclean, which removes any files