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

Commit f7f933b2 authored by Patrick Tu's avatar Patrick Tu Committed by android-build-merger
Browse files

Merge "AIDEGen: Collect the classes.jar of the prebuilt modules into module-info.json" 

am: 58982618

Change-Id: Idd3f21584984bf1c9a51bc83704da016f38dad36
parents 4722b5b1 58982618

core/java_prebuilt_internal.mk

+2 −1
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ ifneq ($(filter $(LOCAL_MODULE),$(PRODUCT_BOOT_JARS)),) 
  $(call pretty-error,Modules in PRODUCT_BOOT_JARS must be defined in Android.bp files)

endif



ALL_MODULES.$(my_register_name).CLASSES_JAR := $(common_classes_jar)



#######################################

# defines built_odex along with rule to install odex

include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk
@@ -239,4 +241,3 @@ $(my_exported_sdk_libs_file): 


endif # ! prebuilt_module_is_dex_javalib

endif # LOCAL_IS_HOST_MODULE is not set

core/soong_java_prebuilt.mk

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ my_built_installed := $(foreach f,$(LOCAL_SOONG_BUILT_INSTALLED),\ 
my_installed := $(call copy-many-files, $(my_built_installed))

ALL_MODULES.$(my_register_name).INSTALLED += $(my_installed)

ALL_MODULES.$(my_register_name).BUILT_INSTALLED += $(my_built_installed)

ALL_MODULES.$(my_register_name).CLASSES_JAR := $(full_classes_jar)

$(my_register_name): $(my_installed)



ifdef LOCAL_SOONG_AAR

core/tasks/module-info.mk

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ $(MODULE_INFO_JSON): 
			'"dependencies": [$(foreach w,$(sort $(ALL_DEPS.$(m).ALL_DEPS)),"$(w)", )], ' \

			'"srcs": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCS)),"$(w)", )], ' \

			'"srcjars": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCJARS)),"$(w)", )], ' \

			'"classes_jar": [$(foreach w,$(sort $(ALL_MODULES.$(m).CLASSES_JAR)),"$(w)", )], ' \

			'},\n' \

	 ) | sed -e 's/, *\]/]/g' -e 's/, *\}/ }/g' -e '$$s/,$$//' >> $@

	$(hide) echo '}' >> $@