diff options
| author | 2020-03-25 14:18:42 -0700 | |
|---|---|---|
| committer | 2020-03-31 16:49:39 -0700 | |
| commit | 1d18d5366ee4cf4a885611f66529b6a5eaa4b934 (patch) | |
| tree | 4f6d01551ea596a181724280560a0009abe6a2d1 | |
| parent | d172b3503ba82b2a9a861c5d5087ac5e91c1086b (diff) | |
Adds the module from package-modules to ALL_MODULES.
This exposes any modules built with package-modules.mk to
module-info.json.
Test: refreshmod, inspect module-info.json and find new modules
from platform_testing/build/tasks/*
Bug: 151670189
Change-Id: I8d502382640f4d49ab2c17fcc251e54720844b76
| -rw-r--r-- | core/tasks/tools/package-modules.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/core/tasks/tools/package-modules.mk b/core/tasks/tools/package-modules.mk index 55a08f51ec..6cafa4a2a3 100644 --- a/core/tasks/tools/package-modules.mk +++ b/core/tasks/tools/package-modules.mk @@ -16,7 +16,16 @@ # my_makefile := $(lastword $(filter-out $(lastword $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) -my_staging_dir := $(call intermediates-dir-for,PACKAGING,$(my_package_name)) + +include $(CLEAR_VARS) +LOCAL_MODULE := $(my_package_name) +LOCAL_MODULE_CLASS := PACKAGING +LOCAL_MODULE_STEM := $(my_package_name).zip +LOCAL_UNINSTALLABLE_MODULE := true +include $(BUILD_SYSTEM)/base_rules.mk +my_staging_dir := $(intermediates) +my_package_zip := $(LOCAL_BUILT_MODULE) + my_built_modules := $(foreach p,$(my_copy_pairs),$(call word-colon,1,$(p))) my_copy_pairs := $(foreach p,$(my_copy_pairs),$(call word-colon,1,$(p)):$(my_staging_dir)/$(call word-colon,2,$(p))) my_pickup_files := @@ -80,7 +89,6 @@ ifneq ($(my_missing_error),) $(error done) endif -my_package_zip := $(my_staging_dir)/$(my_package_name).zip $(my_package_zip): PRIVATE_COPY_PAIRS := $(my_copy_pairs) $(my_package_zip): PRIVATE_PICKUP_FILES := $(my_pickup_files) $(my_package_zip) : $(my_built_modules) |