diff options
| author | Colin Cross <ccross@android.com> | 2014-04-30 18:09:13 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-04-30 18:18:59 -0700 |
| commit | a3339e98e667124717968a54f8324f293a9c2b72 (patch) | |
| tree | 3639f4810f3295eca625be5bccda42795e0ce0c8 /core/executable.mk | |
| parent | 847fd0311f6c82b8ac90d970cfc68aafd9913471 (diff) | |
| download | build-a3339e98e667124717968a54f8324f293a9c2b72.zip build-a3339e98e667124717968a54f8324f293a9c2b72.tar.gz build-a3339e98e667124717968a54f8324f293a9c2b72.tar.bz2 | |
build: split TARGET_PREFER_32_BIT for apps and executables
Introduce two new flags, TARGET_PREFER_32_BIT_APPS and
TARGET_PREFER_32_BIT_EXECUTABLES that individually control
compilation of apps and executables. If TARGET_PREFER_32_BIT is
set, the build system will automatically set both new flags.
Change-Id: Ibd2165e688675c2884d9e7ddf82d7dd6c28521f3
Diffstat (limited to 'core/executable.mk')
| -rw-r--r-- | core/executable.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/executable.mk b/core/executable.mk index b67ac36..7a3e08e 100644 --- a/core/executable.mk +++ b/core/executable.mk @@ -19,9 +19,9 @@ else #!LOCAL_MULTILIB == both LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true endif -# if TARGET_PREFER_32_BIT is set, try to build 32-bit first +# if TARGET_PREFER_32_BIT_EXECUTABLES is set, try to build 32-bit first ifdef TARGET_2ND_ARCH -ifeq ($(TARGET_PREFER_32_BIT),true) +ifeq ($(TARGET_PREFER_32_BIT_EXECUTABLES),true) LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) else LOCAL_2ND_ARCH_VAR_PREFIX := @@ -45,7 +45,7 @@ ifndef my_skip_non_preferred_arch ifdef TARGET_2ND_ARCH # check if the non-preferred arch is the primary or secondary -ifeq ($(TARGET_PREFER_32_BIT),true) +ifeq ($(TARGET_PREFER_32_BIT_EXECUTABLES),true) LOCAL_2ND_ARCH_VAR_PREFIX := else LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) |