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

Commit d37b540a authored by Ying Wang's avatar Ying Wang
Browse files

Auto-clean host tools when switching between apps_only and platform build. 

For apps_only (also PDK build) we use prebuilt host tools in
prebuilts/sdk/tools; For platform build we use tools built from source.
Auto-clean intermediate files of these tools when build type change is
detected.

Bug: 20213206
Change-Id: I9173af322684c017fdb91a3abfbe39ecfe5650e9
(cherry-pick from commit 036b53b6)
parent f4ffafb1

core/cleanbuild.mk

+42 −1
Original line number Diff line number Diff line
@@ -286,6 +286,48 @@ ifeq "$(force_objclean)" "true" 
endif

force_objclean :=



###########################################################

# Clean build tools when swithcing between prebuilt host tools (such as in

# apps_only build) and tools built from source (platform build).

previous_prebuilt_tools_config_file := $(HOST_OUT)/previous_prebuilt_tools_config.mk

ifneq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))

current_prebuilt_tools := true

else

current_prebuilt_tools := false

endif

PREVIOUS_PREBUILT_TOOLS :=

-include $(previous_prebuilt_tools_config_file)

force_tools_clean :=

ifdef PREVIOUS_PREBUILT_TOOLS

ifneq ($(PREVIOUS_PREBUILT_TOOLS),$(current_prebuilt_tools))

force_tools_clean := true

endif

endif # else, this is the first build, so no need to clean.



# Write the new state to the file.

$(shell \

  mkdir -p $(dir $(previous_prebuilt_tools_config_file)) && \

  echo "PREVIOUS_PREBUILT_TOOLS:=$(current_prebuilt_tools)" > \

    $(previous_prebuilt_tools_config_file))



ifeq ($(force_tools_clean),true)

# For this list of prebuilt tools, see prebuilts/sdk/tools/Android.mk.

tools_clean_files := \

  $(HOST_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/signapk_intermediates \

  $(HOST_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/dx_intermediates \

  $(HOST_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/shrinkedAndroid_intermediates \

  $(HOST_OUT)/obj*/EXECUTABLES/aapt_intermediates \

  $(HOST_OUT)/obj*/EXECUTABLES/aidl_intermediates \

  $(HOST_OUT)/obj*/EXECUTABLES/zipalign_intermediates \

  $(HOST_OUT)/obj*/lib/libc++$(HOST_SHLIB_SUFFIX) \



$(info *** build type changed, clean host tools...)

$(info *** rm -rf $(tools_clean_files))

$(shell rm -rf $(tools_clean_files))

endif



###########################################################



.PHONY: clean-jack-files

clean-jack-files: clean-dex-files

	$(hide) find $(OUT_DIR) -name "*.jack" | xargs rm -f
@@ -303,4 +345,3 @@ clean-dex-files: 
clean-jack-incremental:

	$(hide) find $(OUT_DIR) -name "jack-incremental" -type d | xargs rm -rf

	@echo "All jack incremental dirs have been removed."