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

Commit 3c49164e authored by Colin Cross's avatar Colin Cross
Browse files

Allow soong java libraries to include exported resources and proguard flags 

Bug: 73724997
Test: m checkbuild
Change-Id: Ia02f816084d0eb1c0e0f20e1ecd57aaf3778874c
Merged-In: Ia02f816084d0eb1c0e0f20e1ecd57aaf3778874c
(cherry picked from commit 7874138a)
parent 70007750

core/clear_vars.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -240,6 +240,7 @@ LOCAL_SHARED_ANDROID_LIBRARIES:= 
LOCAL_SHARED_LIBRARIES:=

LOCAL_SHARED_LIBRARIES:=

LOCAL_SOONG_CLASSES_JAR :=

LOCAL_SOONG_CLASSES_JAR :=

LOCAL_SOONG_DEX_JAR :=

LOCAL_SOONG_DEX_JAR :=

LOCAL_SOONG_EXPORT_PROGUARD_FLAGS :=

LOCAL_SOONG_HEADER_JAR :=

LOCAL_SOONG_HEADER_JAR :=

LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=

LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=

LOCAL_SOONG_PROGUARD_DICT :=

LOCAL_SOONG_PROGUARD_DICT :=

core/soong_app_prebuilt.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -55,6 +55,7 @@ $(resource_export_package): $(LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE) 
	@echo "Copy: $$@"

	@echo "Copy: $$@"

	$(copy-file-to-target)

	$(copy-file-to-target)

	touch $(PRIVATE_STAMP)

	touch $(PRIVATE_STAMP)

$(call add-dependency,$(LOCAL_BUILT_MODULE),$(resource_export_package))





endif # LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE

endif # LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE

core/soong_java_prebuilt.mk

+18 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,24 @@ ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR 
    $(intermediates.COMMON)/jacoco-report-classes.jar)

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

endif

endif





ifdef LOCAL_SOONG_EXPORT_PROGUARD_FLAGS

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

    $(intermediates.COMMON)/export_proguard_flags))

  $(call add-dependency,$(LOCAL_BUILT_MODULE),\

    $(intermediates.COMMON)/export_proguard_flags)

endif



ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE

my_res_package := $(intermediates.COMMON)/package-res.apk



$(my_res_package): $(LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE)

	@echo "Copy: $$@"

	$(copy-file-to-target)



$(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_res_package))



endif # LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE



ifneq ($(TURBINE_ENABLED),false)

ifneq ($(TURBINE_ENABLED),false)

ifdef LOCAL_SOONG_HEADER_JAR

ifdef LOCAL_SOONG_HEADER_JAR

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

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