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

Commit 7f625aad authored by Ying Wang's avatar Ying Wang
Browse files

Improve rules of split apks. 

- Better messaging if the expected split apk isn't generated by the aapt
  command in the base apk rule; Remove the built base apk, so make will
  rerun aapt after the user changes the splitting parameters.
- Use cleaner static pattern rules instead of running $(foreach) with
  $(eval).

Bug: 16319961
Change-Id: If6ae302e1a39d2e0db8f784d4e1cf292ec855281
parent 84c26b69

core/definitions.mk

+0 −12
Original line number Diff line number Diff line
@@ -1805,18 +1805,6 @@ $(hide) $(ZIPALIGN) -f 4 $@.unaligned $@.aligned 
$(hide) mv $@.aligned $@

endef



# Build a split APK

# The splti APKs are already built in the same command building the base APK.

# We only need to do zipalign and signing etc.

# This macro must be called with $(eval).

# $(1): the path to the built split APK.

# $(2): the path to the base APK.

define build-split-apk

$(1) : $(2)

	$$(sign-package)

	$$(align-package)

endef



define install-dex-debug

$(hide) if [ -f "$(PRIVATE_INTERMEDIATES_DIR)/classes.dex" ]; then \

	    mkdir -p $(TOP)/dalvik/DEBUG-FILES; \

core/package_internal.mk

+16 −6
Original line number Diff line number Diff line
@@ -410,19 +410,29 @@ endif 
###############################

## APK splits

ifdef LOCAL_PACKAGE_SPLITS

# LOCAL_PACKAGE_SPLITS is a list of resource labels.

built_apk_splits := $(foreach s,$(LOCAL_PACKAGE_SPLITS),$(built_module_path)/package_$(s).apk)

installed_apk_splits := $(foreach s,$(LOCAL_PACKAGE_SPLITS),$(my_module_path)/$(LOCAL_MODULE)_$(s).apk)



# The splits should have been built in the same command building the base apk.

# This rule just runs signing and zipalign etc.

# Note that we explicily check the existence of the split apk and remove the

# built base apk if the split apk isn't there.

# That way the build system will rerun the aapt after the user changes the splitting parameters.

$(built_apk_splits): PRIVATE_PRIVATE_KEY := $(private_key)

$(built_apk_splits): PRIVATE_CERTIFICATE := $(certificate)

# The splits should have been built in the same command building the base apk.

# This rule just establishes the dependency and make sure the splits are up to date.

$(foreach s,$(built_apk_splits),\

  $(eval $(call build-split-apk,$(s),$(LOCAL_BUILT_MODULE))))

$(built_apk_splits) : $(built_module_path)/%.apk : $(LOCAL_BUILT_MODULE)

	$(hide) if [ ! -f $@ ]; then \

	  echo 'No $@ generated, check your apk splitting parameters.' 1>&2; \

	  rm $<; exit 1; \

	fi

	$(sign-package)

	$(align-package)



# Rules to install the splits

$(foreach s,$(LOCAL_PACKAGE_SPLITS),\

  $(eval $(call copy-one-file,$(built_module_path)/package_$(s).apk,$(my_module_path)/$(LOCAL_MODULE)_$(s).apk)))

$(installed_apk_splits) : $(my_module_path)/$(LOCAL_MODULE)_%.apk : $(built_module_path)/package_%.apk | $(ACP)

	@echo "Install: $@"

	$(copy-file-to-new-target)



# Register the additional built and installed files.

ALL_MODULES.$(my_register_name).INSTALLED += $(installed_apk_splits)