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

Commit 13a225ff authored by Ying Wang's avatar Ying Wang Committed by android-build-merger
Browse files

Merge "Remove the prebuilt tools cleanstep logic."

am: cff032ca

* commit 'cff032ca':
  Remove the prebuilt tools cleanstep logic.
parents 8449b88b cff032ca
Loading
Loading
Loading
Loading
+0 −42
Original line number Diff line number Diff line
@@ -300,48 +300,6 @@ 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.
ifneq ($(PREVIOUS_PREBUILT_TOOLS),$(current_prebuilt_tools))
$(shell \
  mkdir -p $(dir $(previous_prebuilt_tools_config_file)) && \
  echo "PREVIOUS_PREBUILT_TOOLS:=$(current_prebuilt_tools)" > \
    $(previous_prebuilt_tools_config_file))
endif

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