Merge "Provide make variables for java binaries"

am: 5e19557eb9

Change-Id: Ib1be7da98214e3b6c27867b80005e18cc68a0d33
This commit is contained in:
Colin Cross
2017-07-01 01:36:14 +00:00
committed by android-build-merger
11 changed files with 25 additions and 21 deletions

View File

@@ -207,7 +207,7 @@ $(built_aar) : $(aar_classes_jar) $(full_android_manifest)
# Note: Use "cp -n" to honor the resource overlay rules, if multiple res dirs exist.
$(hide) $(foreach res,$(PRIVATE_RESOURCE_DIR),cp -Rfn $(res)/* $(dir $@)aar/res;)
$(hide) cp $(PRIVATE_R_TXT) $(dir $@)aar/R.txt
$(hide) jar -cMf $@ \
$(hide) $(JAR) -cMf $@ \
-C $(dir $@)aar .
# Register the aar file.