commit 0028485c94b50197d0eb83b02f3062735092bbac
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 11 07:32:24 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 11 07:32:24 2018 +0000
tree d9616397be335c951a98026cfe99347820fae459
parent 6536add28759b63db2d9ae1b6fd6d665fc2411b0
parent 5046d4c749c55943f8cf31f50d9dec9b94187203

Merge "Disable warnings for unknown modules in package-modules.mk" into pi-dev

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index df3a59e..5bad23e 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -3093,7 +3093,7 @@
 define create-suite-dependencies
 $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
   $(eval COMPATIBILITY.$(suite).FILES := \
-    $(COMPATIBILITY.$(suite).FILES) $(foreach f,$(my_compat_dist_$(suite)),$(call word-colon,2,$(f))))) \
+    $$(COMPATIBILITY.$(suite).FILES) $$(foreach f,$$(my_compat_dist_$(suite)),$$(call word-colon,2,$$(f))))) \
 $(eval $(my_all_targets) : $(call copy-many-files, \
   $(sort $(foreach suite,$(LOCAL_COMPATIBILITY_SUITE),$(my_compat_dist_$(suite))))))
 endef

core/static_java_library.mk

diff --git a/core/static_java_library.mk b/core/static_java_library.mk
index 0afb857..0429dd2 100644
--- a/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@ -155,7 +155,7 @@
 LOCAL_SRCJARS += $(my_srcjar)
 $(R_file_stamp): PRIVATE_SRCJAR := $(my_srcjar)
 $(R_file_stamp): PRIVATE_JAVA_GEN_DIR := $(intermediates.COMMON)/aapt
-$(R_file_stamp): .KATI_IMPLICIT_OUTPUTS := $(intermediates.COMMON)/R.txt) $(my_srcjar)
+$(R_file_stamp): .KATI_IMPLICIT_OUTPUTS := $(my_srcjar)
 endif
 
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ANDROID_MANIFEST := $(full_android_manifest)