commit 74e4cf10bf1c3b120aa31121011dbf3a625c6a07
author Colin Cross <ccross@android.com> Mon Oct 29 23:17:02 2018 -0700
committer Colin Cross <ccross@android.com> Tue Oct 30 15:48:33 2018 -0700
tree 482d4efe5af3407cf7715e7828f9a5d4e6c10c44
parent afc4604f6731f0d427dc48e3996d4ba3ffe9297b

Store AAR path from Soong for dist

Store the path to the AAR file from Soong so that it will be picked
up by dist if requested in TARGET_BUILD_APPS.

Test: m checkbuild
Change-Id: Ifeaf2b5ca3f405fbe79a966ceee9989a38d77f6e

core/soong_java_prebuilt.mk

diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk
index 288a763..dd7d48b 100644
--- a/core/soong_java_prebuilt.mk
+++ b/core/soong_java_prebuilt.mk
@@ -128,6 +128,10 @@
   $(eval $(call copy-one-file,$(full_classes_jar),$(LOCAL_BUILT_MODULE)))
 endif  # LOCAL_SOONG_DEX_JAR
 
+ifdef LOCAL_SOONG_AAR
+  ALL_MODULES.$(LOCAL_MODULE).AAR := $(LOCAL_SOONG_AAR)
+endif
+
 javac-check : $(full_classes_jar)
 javac-check-$(LOCAL_MODULE) : $(full_classes_jar)
 .PHONY: javac-check-$(LOCAL_MODULE)