From 17de09f74d54046912256e10bbbf1c17619c6ab6 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 28 Mar 2018 22:36:00 -0700 Subject: [PATCH] Don't depend on R.txt) There is an extra ) in the implicit output path for R.txt, which causes the rule to rerun every time because of a missing output file. There is already an implicit output for R.txt on line 180 (which is why the incorrect path didn't cause an immediate "No rule to generate R.txt" error), so just remove the incorrect one. Bug: 77244156 Test: m checkbuild && m checkbuild Change-Id: Id960ee211b89a9a5f5104cdcac23bc3124742145 Merged-In: Id960ee211b89a9a5f5104cdcac23bc3124742145 (cherry picked from commit ac48f41ba561233fe0372da939051f27d3ceb422) --- core/static_java_library.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/static_java_library.mk b/core/static_java_library.mk index 0afb857d9..0429dd2d2 100644 --- a/core/static_java_library.mk +++ b/core/static_java_library.mk @@ -155,7 +155,7 @@ my_srcjar := $(intermediates.COMMON)/aapt.srcjar 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)