Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8e6166f authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY"

parents 2dcaf9f4 78d642f4

core/clear_vars.mk

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ LOCAL_DIST_BUNDLED_BINARIES:= 
LOCAL_HAL_STATIC_LIBRARIES:=

LOCAL_NO_SYNTAX_CHECK:=

LOCAL_NO_STATIC_ANALYZER:=

LOCAL_32BIT_ONLY:= # '',true

LOCAL_32_BIT_ONLY:= # '',true

LOCAL_NO_2ND_ARCH:= # '',true



# arch specific variables

core/executable.mk

+2 −2
Original line number Diff line number Diff line 
# We don't automatically set up rules to build executables for both

# TARGET_ARCH and TARGET_2ND_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)

else

LOCAL_2ND_ARCH_VAR_PREFIX :=

core/package.mk

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
## 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)

else

LOCAL_2ND_ARCH_VAR_PREFIX :=

core/prebuilt.mk

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ ifneq ($(LOCAL_PREBUILT_JAVA_LIBRARIES),) 
$(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH))

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

LOCAL_2ND_ARCH_VAR_PREFIX :=

else

core/shared_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ $(warning $(LOCAL_MODULE): LOCAL_UNSTRIPPED_PATH for shared libraries is unsuppo 
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

LOCAL_2ND_ARCH_VAR_PREFIX :=

include $(BUILD_SYSTEM)/shared_library_internal.mk