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

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

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

am: 2754a92f

Change-Id: I0330408470fa28549358b0695e4a65f9ac33a92c
parents 3ae1f7af 2754a92f

core/static_java_library.mk

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