commit f1db7e23d91a8c080a7d0fdcaba9c04694b9aee6
author Ying Wang <wangying@google.com> Wed Dec 17 17:00:53 2014 -0800
committer Ying Wang <wangying@google.com> Thu Dec 18 12:02:38 2014 -0800
tree 235ccdca8dbdf5a9e853d96ca1f6572455485f9c
parent a0096d12d17cbc7d7ff24ad62078e049d25567e2

Support to build AAR for static Java libraries.

Set up rules to build $(built_aar), if a static Java library has Android
resources.
If you run "tapas my_lib && make dist", my_lib.aar will be built and put
in the DIST_DIR.

Bug: 18759503
Change-Id: I36b912eb7bbab241fe48319115ea320efe77c705

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 4fbd01e..731061f 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -915,7 +915,9 @@
   # For uninstallable modules such as static Java library, we have to dist the built file,
   # as <module_name>.<suffix>
   apps_only_dist_built_files := $(foreach m,$(unbundled_build_modules),$(if $(ALL_MODULES.$(m).INSTALLED),,\
-      $(if $(ALL_MODULES.$(m).BUILT),$(ALL_MODULES.$(m).BUILT):$(m)$(suffix $(ALL_MODULES.$(m).BUILT)))))
+      $(if $(ALL_MODULES.$(m).BUILT),$(ALL_MODULES.$(m).BUILT):$(m)$(suffix $(ALL_MODULES.$(m).BUILT)))\
+      $(if $(ALL_MODULES.$(m).AAR),$(ALL_MODULES.$(m).AAR):$(m).aar)\
+      ))
   $(call dist-for-goals,apps_only, $(apps_only_dist_built_files))
 
   ifeq ($(EMMA_INSTRUMENT),true)