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

Commit b51df6d1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I9c735fe2,Ib918b2ed 

* changes:
  Don't clean obj/{APPS,JAVA_LIBRARIES} during installclean
  Disable auto installclean for AAPT config change
parents 240faf5e 84f4f3b7

core/cleanbuild.mk

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