From 912de8e69139057f851dad0d20c092cadf1679a1 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 22 Dec 2016 13:17:17 -0800 Subject: [PATCH] Fix incremental builds with AAPT2 When we removed the src/ directory, the R.stamp file was removed -- with AAPT, this triggers src/android/Manifest.java to be regenerated. But AAPT2 only uses the R.stamp file as a timestamp to find the Manifest.java file, not to create it. So add a new CleanSpec.mk to fix the builds by removing the target that AAPT2 uses to generate the src/android/Manifest.java file. Test: None Change-Id: If56f326ad701f7f92aa7c8aeda57e92d9c62cff9 --- CleanSpec.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CleanSpec.mk b/CleanSpec.mk index f153de0d5..bbeac6ca0 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -390,6 +390,11 @@ $(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/ $(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/previous_gen_java_config.mk) $(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/current_gen_java_config.mk) +$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/*/package-res.apk) +$(call add-clean-step, rm -rf $(TARGET_OUT_INTERMEDIATES)/APPS/*/package-res.apk) +$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS/*_intermediates/src) +$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/*_intermediates/src) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ -- 2.11.0