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

Commit 5ed74386 authored by Daniel Norman's avatar Daniel Norman Committed by Automerger Merge Worker
Browse files

Merge "Adds the module from package-modules to ALL_MODULES." am: 63a16b56 

Change-Id: I763df65457486e0c76cecbecf7f41e59623c194c
parents 5cffa985 63a16b56

core/tasks/tools/package-modules.mk

+10 −2
Original line number Diff line number Diff line
@@ -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)