Merge "Fix typo when building aar" am: f759166bb8

am: 152ac2818a

Change-Id: I0600a3a7da597296932c8df091028dbf97e240a9
This commit is contained in:
Colin Cross
2017-08-17 22:36:47 +00:00
committed by android-build-merger

View File

@@ -209,7 +209,7 @@ $(built_aar) : $(aar_classes_jar) $(full_android_manifest)
$(hide) $(foreach res,$(PRIVATE_RESOURCE_DIR),cp -Rfn $(res)/* $(dir $@)aar/res;)
$(hide) cp $(PRIVATE_R_TXT) $(dir $@)aar/R.txt
$(hide) $(JAR) -cMf $@ \
$(call jar-args-sorted-files-in-directory,(dir $@)aar)
$(call jar-args-sorted-files-in-directory,$(dir $@)aar)
# Register the aar file.
ALL_MODULES.$(LOCAL_MODULE).AAR := $(built_aar)