From 74e4cf10bf1c3b120aa31121011dbf3a625c6a07 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 29 Oct 2018 23:17:02 -0700 Subject: [PATCH] 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/clear_vars.mk | 1 + core/soong_java_prebuilt.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 467637e5f..34a1db894 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -254,6 +254,7 @@ LOCAL_SDK_RES_VERSION:= LOCAL_SDK_VERSION:= LOCAL_SHARED_ANDROID_LIBRARIES:= LOCAL_SHARED_LIBRARIES:= +LOCAL_SOONG_AAR := LOCAL_SOONG_BUNDLE := LOCAL_SOONG_CLASSES_JAR := LOCAL_SOONG_DEX_JAR := diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk index 288a763ce..dd7d48b1b 100644 --- a/core/soong_java_prebuilt.mk +++ b/core/soong_java_prebuilt.mk @@ -128,6 +128,10 @@ else # LOCAL_SOONG_DEX_JAR $(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)