From d927abe8a888ec7599e4601ac630edbf556085f6 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Wed, 15 Nov 2017 17:00:46 -0800
Subject: [PATCH] Clear some aapt2.mk inputs after use

my_generated_res_dirs wasn't being reset in some cases in between
different modules. To be safe, clear every input variable that I was sure
was not being used by the caller after aapt2.mk.

Test: m
Test: m ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
Change-Id: I37c861d99637cad77a2a378a119bf66cee373b3a
---
 core/aapt2.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/aapt2.mk b/core/aapt2.mk
index 8bb2d4b4a..c582e30df 100644
--- a/core/aapt2.mk
+++ b/core/aapt2.mk
@@ -108,3 +108,13 @@ ifdef LOCAL_EXPORT_PACKAGE_RESOURCES
 
 	cp $@ $(PRIVATE_RESOURCE_EXPORT_PACKAGE)
 endif
+
+# Clear inputs only used in this file, so that they're not re-used during the next build
+my_res_resources :=
+my_overlay_resources :=
+my_compiled_res_base_dir :=
+my_asset_dirs :=
+my_full_asset_paths :=
+my_apk_split_configs :=
+my_generated_res_dirs :=
+my_generated_res_dirs_deps :=