Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c455d639 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Don't depend on R.txt)" am: 2754a92f 

am: 54340d91

Change-Id: I7387787691d621ac259a8c77efd480cdcd373b1e
parents e09ce695 54340d91

core/static_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)