StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dist bundle modules from Soong

Browse Source 
Dist bundle modules when requested by TARGET_BUILD_APPS.

Bug: 117295826
Test: tapas RecoveryLocalizer && m dist
Change-Id: Iad63ceafc2a60e6735b50eca65cc4859f9d71b52
This commit is contained in:
Colin Cross
2018-10-29 23:16:42 -07:00
parent e0006c91ca
commit 0fb8c97b02
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/clear_vars.mk
View File

@@ -254,6 +254,7 @@ LOCAL_SDK_RES_VERSION:=
LOCAL_SDK_VERSION:= LOCAL_SDK_VERSION:=
LOCAL_SHARED_ANDROID_LIBRARIES:= LOCAL_SHARED_ANDROID_LIBRARIES:=
LOCAL_SHARED_LIBRARIES:= LOCAL_SHARED_LIBRARIES:=
LOCAL_SOONG_BUNDLE :=
LOCAL_SOONG_CLASSES_JAR := LOCAL_SOONG_CLASSES_JAR :=
LOCAL_SOONG_DEX_JAR := LOCAL_SOONG_DEX_JAR :=
LOCAL_SOONG_EXPORT_PROGUARD_FLAGS := LOCAL_SOONG_EXPORT_PROGUARD_FLAGS :=

6
core/main.mk
View File

@@ -1299,6 +1299,12 @@ ifneq ($(TARGET_BUILD_APPS),)
# Dist the installed files if they exist. # Dist the installed files if they exist.
apps_only_installed_files := $(foreach m,$(unbundled_build_modules),$(ALL_MODULES.$(m).INSTALLED)) apps_only_installed_files := $(foreach m,$(unbundled_build_modules),$(ALL_MODULES.$(m).INSTALLED))
$(call dist-for-goals,apps_only, $(apps_only_installed_files)) $(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, # For uninstallable modules such as static Java library, we have to dist the built file,
# as <module_name>.<suffix> # as <module_name>.<suffix>
apps_only_dist_built_files := $(foreach m,$(unbundled_build_modules),$(if $(ALL_MODULES.$(m).INSTALLED),,\ apps_only_dist_built_files := $(foreach m,$(unbundled_build_modules),$(if $(ALL_MODULES.$(m).INSTALLED),,\

4
core/soong_app_prebuilt.mk
View File

@@ -102,6 +102,10 @@ endif
PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES)) 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 ifndef LOCAL_IS_HOST_MODULE
ifeq ($(LOCAL_SDK_VERSION),system_current) ifeq ($(LOCAL_SDK_VERSION),system_current)
my_link_type := java:system my_link_type := java:system