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

Commit 75a698b3 authored by Colin Cross's avatar Colin Cross
Browse files

Export app implementation and header jars 

Also fix a missing dependency on the jacoco-report-classes.jar

Test: m checkbuild
Change-Id: I67e924051e1029a409b82f2220811a27d5401db9
parent aec47c67

core/clear_vars.mk

+2 −1
Original line number Diff line number Diff line
@@ -227,8 +227,9 @@ LOCAL_SDK_RES_VERSION:= 
LOCAL_SDK_VERSION:=

LOCAL_SHARED_ANDROID_LIBRARIES:=

LOCAL_SHARED_LIBRARIES:=

LOCAL_SOONG_HEADER_JAR :=

LOCAL_SOONG_CLASSES_JAR :=

LOCAL_SOONG_DEX_JAR :=

LOCAL_SOONG_HEADER_JAR :=

LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=

LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=

LOCAL_SOONG_RRO_DIRS :=

core/soong_app_prebuilt.mk

+18 −0
Original line number Diff line number Diff line
@@ -16,8 +16,26 @@ include $(BUILD_SYSTEM)/base_rules.mk 
ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR

  $(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\

    $(intermediates.COMMON)/jacoco-report-classes.jar))

  $(call add-dependency,$(common_javalib.jar),\

    $(intermediates.COMMON)/jacoco-report-classes.jar)

endif



full_classes_jar := $(intermediates.COMMON)/classes.jar

full_classes_pre_proguard_jar := $(intermediates.COMMON)/classes-pre-proguard.jar

full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar



$(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_jar)))

$(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_pre_proguard_jar)))



ifneq ($(TURBINE_DISABLED),false)

ifdef LOCAL_SOONG_HEADER_JAR

$(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar)))

else

$(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar)))

endif

endif # TURBINE_DISABLED != false





$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))



ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE