diff options
| author | Ying Wang <wangying@google.com> | 2014-02-14 00:15:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-14 00:15:42 +0000 |
| commit | 1fd8265d1a1a48d8c1805553669bbefb32956deb (patch) | |
| tree | 3a9c74d70341074c1a993e112b25d435fcc40fef /core/main.mk | |
| parent | 25d84aa38f79f40df54a0a4e75b3e89253a4b332 (diff) | |
| parent | 1e8fec5baea381604a2bf197bfb091eeb7aa36ef (diff) | |
| download | build-1fd8265d1a1a48d8c1805553669bbefb32956deb.zip build-1fd8265d1a1a48d8c1805553669bbefb32956deb.tar.gz build-1fd8265d1a1a48d8c1805553669bbefb32956deb.tar.bz2 | |
am 1e8fec5b: am e2f06adb: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build."
* commit '1e8fec5baea381604a2bf197bfb091eeb7aa36ef':
Don't check the existence for the 64-bit modules for 32-bit SDK build.
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/main.mk b/core/main.mk index 36c2cae..f00e859 100644 --- a/core/main.mk +++ b/core/main.mk @@ -764,6 +764,10 @@ ifdef is_sdk_build $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \ $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\ $(eval dangling_modules += $(m)))) + ifneq ($(TARGET_IS_64_BIT),true) + # We know those 64-bit modules don't exist in the 32-bit SDK build. + dangling_modules := $(filter-out %64,$(dangling_modules)) + endif ifneq ($(dangling_modules),) $(error Module names '$(dangling_modules)' in PRODUCT_PACKAGES has nothing to install!) endif |