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

Commit 0fb8c97b authored by Colin Cross's avatar Colin Cross
Browse files

Dist bundle modules from Soong 

Dist bundle modules when requested by TARGET_BUILD_APPS.

Bug: 117295826
Test: tapas RecoveryLocalizer && m dist
Change-Id: Iad63ceafc2a60e6735b50eca65cc4859f9d71b52
parent e0006c91

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_BUNDLE :=

LOCAL_SOONG_CLASSES_JAR :=

LOCAL_SOONG_DEX_JAR :=

LOCAL_SOONG_EXPORT_PROGUARD_FLAGS :=

core/main.mk

+6 −0
Original line number Diff line number Diff line
@@ -1299,6 +1299,12 @@ ifneq ($(TARGET_BUILD_APPS),) 
  # Dist the installed files if they exist.

  apps_only_installed_files := $(foreach m,$(unbundled_build_modules),$(ALL_MODULES.$(m).INSTALLED))

  $(call dist-for-goals,apps_only, $(apps_only_installed_files))



  # Dist the bundle files if they exist.

  apps_only_bundle_files := $(foreach m,$(unbundled_build_modules),\

    $(if $(ALL_MODULES.$(m).BUNDLE),$(ALL_MODULES.$(m).BUNDLE):$(m)-base.zip))

  $(call dist-for-goals,apps_only, $(apps_only_bundle_files))



  # For uninstallable modules such as static Java library, we have to dist the built file,

  # as <module_name>.<suffix>

  apps_only_dist_built_files := $(foreach m,$(unbundled_build_modules),$(if $(ALL_MODULES.$(m).INSTALLED),,\

core/soong_app_prebuilt.mk

+4 −0
Original line number Diff line number Diff line
@@ -102,6 +102,10 @@ endif 


PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))



ifdef LOCAL_SOONG_BUNDLE

  ALL_MODULES.$(LOCAL_MODULE).BUNDLE := $(LOCAL_SOONG_BUNDLE)

endif



ifndef LOCAL_IS_HOST_MODULE

ifeq ($(LOCAL_SDK_VERSION),system_current)

my_link_type := java:system