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

Commit 4dfb5580 authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set" into lmp-dev

parents b169fb78 934008f9

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)