StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY"

Browse Source 
* commit 'a8e6166fa482782719dce28a9ae1869f017e7cee':
  build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY
This commit is contained in:
Colin Cross
2014-01-31 10:27:06 +00:00
committed by Android Git Automerger
parent df313a04a1 a8e6166fa4
commit 6a7699d5c6
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/clear_vars.mk
View File

@@ -143,7 +143,7 @@ LOCAL_DIST_BUNDLED_BINARIES:=
LOCAL_HAL_STATIC_LIBRARIES:= LOCAL_HAL_STATIC_LIBRARIES:=
LOCAL_NO_SYNTAX_CHECK:= LOCAL_NO_SYNTAX_CHECK:=
LOCAL_NO_STATIC_ANALYZER:= LOCAL_NO_STATIC_ANALYZER:=
LOCAL_32BIT_ONLY:= # '',true LOCAL_32_BIT_ONLY:= # '',true
LOCAL_NO_2ND_ARCH:= # '',true LOCAL_NO_2ND_ARCH:= # '',true
# arch specific variables # arch specific variables

4
core/executable.mk
View File

@@ -1,9 +1,9 @@
# We don't automatically set up rules to build executables for both # We don't automatically set up rules to build executables for both
# TARGET_ARCH and TARGET_2ND_ARCH. # TARGET_ARCH and TARGET_2ND_ARCH.
# By default, an executable is built for TARGET_ARCH. # By default, an executable is built for TARGET_ARCH.
# To build it for TARGET_2ND_ARCH in a 64bit product, use "LOCAL_32BIT_ONLY := true". # To build it for TARGET_2ND_ARCH in a 64bit product, use "LOCAL_32_BIT_ONLY := true".
ifeq ($(TARGET_IS_64_BIT)|$(LOCAL_32BIT_ONLY),true|true) ifeq ($(TARGET_IS_64_BIT)|$(LOCAL_32_BIT_ONLY),true|true)
LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)
else else
LOCAL_2ND_ARCH_VAR_PREFIX := LOCAL_2ND_ARCH_VAR_PREFIX :=

2
core/package.mk
View File

@@ -25,7 +25,7 @@
## be set for you. ## be set for you.
########################################################### ###########################################################
ifeq ($(TARGET_IS_64_BIT)|$(LOCAL_32BIT_ONLY),true|true) ifeq ($(TARGET_IS_64_BIT)|$(LOCAL_32_BIT_ONLY),true|true)
LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)
else else
LOCAL_2ND_ARCH_VAR_PREFIX := LOCAL_2ND_ARCH_VAR_PREFIX :=

2
core/prebuilt.mk
View File

@@ -16,7 +16,7 @@ ifneq ($(LOCAL_PREBUILT_JAVA_LIBRARIES),)
$(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH)) $(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH))
endif endif
ifneq ($(TARGET_IS_64_BIT)|$(LOCAL_32BIT_ONLY),true|true) ifneq ($(TARGET_IS_64_BIT)|$(LOCAL_32_BIT_ONLY),true|true)
# Build for TARGET_ARCH # Build for TARGET_ARCH
LOCAL_2ND_ARCH_VAR_PREFIX := LOCAL_2ND_ARCH_VAR_PREFIX :=
else else

2
core/shared_library.mk
View File

@@ -10,7 +10,7 @@ $(warning $(LOCAL_MODULE): LOCAL_UNSTRIPPED_PATH for shared libraries is unsuppo
endif endif
endif endif
ifneq ($(TARGET_IS_64_BIT)|$(LOCAL_32BIT_ONLY),true|true) ifneq ($(TARGET_IS_64_BIT)|$(LOCAL_32_BIT_ONLY),true|true)
# Build for TARGET_ARCH # Build for TARGET_ARCH
LOCAL_2ND_ARCH_VAR_PREFIX := LOCAL_2ND_ARCH_VAR_PREFIX :=
include $(BUILD_SYSTEM)/shared_library_internal.mk include $(BUILD_SYSTEM)/shared_library_internal.mk

2
core/static_library.mk
View File

@@ -1,4 +1,4 @@
ifneq ($(TARGET_IS_64_BIT)|$(LOCAL_32BIT_ONLY),true|true) ifneq ($(TARGET_IS_64_BIT)|$(LOCAL_32_BIT_ONLY),true|true)
# Build for TARGET_ARCH # Build for TARGET_ARCH
LOCAL_2ND_ARCH_VAR_PREFIX := LOCAL_2ND_ARCH_VAR_PREFIX :=
include $(BUILD_SYSTEM)/static_library_internal.mk include $(BUILD_SYSTEM)/static_library_internal.mk