Merge "Don't depend on R.txt)"

This commit is contained in:
Treehugger Robot 2018-04-11 04:03:50 +00:00 committed by Gerrit Code Review
commit 2754a92f2c

View file

@ -152,7 +152,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)