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

Commit 716a784a authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge changes from topics "soong-aar", "soong-bundle" am: c66c3174 

am: dee06f7f

Change-Id: Ia1851e5bcd775f17d40b38b83cd200023bfd1c55
parents 904adc87 dee06f7f

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)