diff options
| author | Colin Cross <ccross@android.com> | 2014-03-21 12:29:32 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-03-26 13:12:59 -0700 |
| commit | e6e48f67d8fac2b5a29dbfeb1ad40610a451b792 (patch) | |
| tree | 0b43fbdb009e5c6803bafb5eb84b8bcdb378c009 /core/package.mk | |
| parent | 36a67a9040f35fc47c0ea5cafa61910a7e2fcc66 (diff) | |
| download | build-e6e48f67d8fac2b5a29dbfeb1ad40610a451b792.zip build-e6e48f67d8fac2b5a29dbfeb1ad40610a451b792.tar.gz build-e6e48f67d8fac2b5a29dbfeb1ad40610a451b792.tar.bz2 | |
add support for LOCAL_MULTILIB
LOCAL_MULTILIB replaces LOCAL_32_BIT_ONLY and
LOCAL_NO_2ND_ARCH, although both are still supported.
Set LOCAL_MULTILIB := 32 to always build a module 32-bit.
This is the same as specifying LOCAL_32_BIT_ONLY.
Set LOCAL_MULTILIB := first to always build a module for
the first architecture (64-bit on a 64-bit target, 32-bit on a
32-bit target). This is the same as specifying LOCAL_NO_2ND_ARCH.
Set LOCAL_MULTILIB := both to build for both architectures
on a mulitlib (64-bit) target.
If LOCAL_MULTILIB is not set libraries will default to "both",
and executables, packages, and prebuilts will default to building
for the first architecture if supported by the module, otherwise
the second.
Executables that set LOCAL_MULTILIB := both must set either
LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 or
LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to specify how to
differentiate the install locations of the two versions.
Change-Id: I22ab6aa342b231c307b1d8a86cea4fd91eea39f5
Diffstat (limited to 'core/package.mk')
| -rw-r--r-- | core/package.mk | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/core/package.mk b/core/package.mk index b40ac37..337d3d0 100644 --- a/core/package.mk +++ b/core/package.mk @@ -1,15 +1,23 @@ # We don't automatically set up rules to build packages for both # TARGET_ARCH and TARGET_2ND_ARCH. # By default, an package is built for TARGET_ARCH. -# To build it for TARGET_2ND_ARCH in a 64bit product, use "LOCAL_32_BIT_ONLY := true". +# To build it for TARGET_2ND_ARCH in a 64bit product, use "LOCAL_MULTILIB := 32". + +include $(BUILD_SYSTEM)/multilib.mk + +ifndef my_module_multilib +# packages default to building for either architecture, +# the first if its supported, otherwise the second. +my_module_multilib := both +endif LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true -# check if primary arch is supported +# check if first arch is supported LOCAL_2ND_ARCH_VAR_PREFIX := include $(BUILD_SYSTEM)/module_arch_supported.mk ifeq ($(my_module_arch_supported),true) -# primary arch is supported +# first arch is supported include $(BUILD_SYSTEM)/package_internal.mk else ifneq (,$(TARGET_2ND_ARCH)) # check if secondary arch is supported |