diff options
| author | Ying Wang <wangying@google.com> | 2014-07-30 20:44:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-30 20:38:44 +0000 |
| commit | 4dfb5580c2e33eebda24e377c5ce2a73a93d4258 (patch) | |
| tree | a85b0d045d8f6f18f5e2e3f247b70f1e6e25cd8a | |
| parent | b169fb78227f4a42ac239c134e547e2fd12991ca (diff) | |
| parent | 934008f9d599fa95edf3ccdd5d5378f9ad4581f0 (diff) | |
| download | build-4dfb5580c2e33eebda24e377c5ce2a73a93d4258.zip build-4dfb5580c2e33eebda24e377c5ce2a73a93d4258.tar.gz build-4dfb5580c2e33eebda24e377c5ce2a73a93d4258.tar.bz2 | |
Merge "Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set" into lmp-dev
| -rw-r--r-- | core/package_internal.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk index 3f8bdfe..0d6f9ea 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -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) |