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/multilib.mk | |
| parent | 36a67a9040f35fc47c0ea5cafa61910a7e2fcc66 (diff) | |
| download | build_make-e6e48f67d8fac2b5a29dbfeb1ad40610a451b792.tar.gz build_make-e6e48f67d8fac2b5a29dbfeb1ad40610a451b792.tar.bz2 build_make-e6e48f67d8fac2b5a29dbfeb1ad40610a451b792.zip | |
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/multilib.mk')
| -rw-r--r-- | core/multilib.mk | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/core/multilib.mk b/core/multilib.mk new file mode 100644 index 0000000000..fa5397a773 --- /dev/null +++ b/core/multilib.mk @@ -0,0 +1,26 @@ +# Translate LOCAL_32_BIT_ONLY and LOCAL_NO_2ND_ARCH to LOCAL_MULTILIB, +# and check LOCAL_MULTILIB is a valid value. Returns module's multilib +# setting in my_module_multilib, or empty if not set. + +my_module_multilib := $(strip $(LOCAL_MULTILIB)) +ifndef my_module_multilib +ifeq ($(LOCAL_32_BIT_ONLY)|$(LOCAL_NO_2ND_ARCH),true|true) +ifdef TARGET_2ND_ARCH +# Both LOCAL_32_BIT_ONLY and LOCAL_NO_2ND_ARCH specified on 64-bit target +# skip the module completely +my_module_multilib := none +else +# Both LOCAL_32_BIT_ONLY and LOCAL_NO_2ND_ARCH specified on 32-bit target +# build for 32-bit +my_module_multilib := 32 +endif +else ifeq ($(LOCAL_32_BIT_ONLY),true) +my_module_multilib := 32 +else ifeq ($(LOCAL_NO_2ND_ARCH),true) +my_module_multilib := first +endif +else # my_module_multilib defined +ifeq (,$(filter 32 first both none,$(my_module_multilib))) +$(error $(LOCAL_PATH): Invalid LOCAL_MULTILIB specified for module $(LOCAL_MODULE)) +endif +endif # my_module_multilib defined |