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

Commit 934008f9 authored by Ying Wang's avatar Ying Wang
Browse files

Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set 

Bug: 16319961
Change-Id: I8ea308c94ff58eaccd8854ab98e11238b993f867
parent a961a09e

core/package_internal.mk

+4 −0
Original line number Diff line number Diff line
@@ -370,8 +370,12 @@ ifeq ($(LOCAL_AAPT_INCLUDE_ALL_RESOURCES),true) 
    $(LOCAL_BUILT_MODULE): PRIVATE_PRODUCT_AAPT_PREF_CONFIG :=

else

    $(LOCAL_BUILT_MODULE): PRIVATE_PRODUCT_AAPT_CONFIG := $(PRODUCT_AAPT_CONFIG)

ifdef LOCAL_PACKAGE_SPLITS

    $(LOCAL_BUILT_MODULE): PRIVATE_PRODUCT_AAPT_PREF_CONFIG :=

else

    $(LOCAL_BUILT_MODULE): PRIVATE_PRODUCT_AAPT_PREF_CONFIG := $(PRODUCT_AAPT_PREF_CONFIG)

endif

endif

$(LOCAL_BUILT_MODULE): $(all_res_assets) $(jni_shared_libraries) $(full_android_manifest)

	@echo "target Package: $(PRIVATE_MODULE) ($@)"

	$(create-empty-package)