Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74e4cf10 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent afc4604f

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -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 :=

core/soong_java_prebuilt.mk

+4 −0
Original line number Diff line number Diff line
@@ -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)