From 78d642f426ea610643913485ab63db7b446c7391 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 29 Jan 2014 18:20:01 -0800
Subject: [PATCH] build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY

Rename for consistency with TARGET_IS_64_BIT.

Change-Id: I824dcaed0c1e88b8246bcffb21ab3f1772175926
---
 core/clear_vars.mk     | 2 +-
 core/executable.mk     | 4 ++--
 core/package.mk        | 2 +-
 core/prebuilt.mk       | 2 +-
 core/shared_library.mk | 2 +-
 core/static_library.mk | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 32e1de6d30..f884b194c8 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -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
diff --git a/core/executable.mk b/core/executable.mk
index baa6a74ea1..22884b8efe 100644
--- a/core/executable.mk
+++ b/core/executable.mk
@@ -1,9 +1,9 @@
 # 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 :=
diff --git a/core/package.mk b/core/package.mk
index 53192b4738..559a3d9aa2 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -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 :=
diff --git a/core/prebuilt.mk b/core/prebuilt.mk
index d5fa4ba2aa..de0d92c2ea 100644
--- a/core/prebuilt.mk
+++ b/core/prebuilt.mk
@@ -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
diff --git a/core/shared_library.mk b/core/shared_library.mk
index 9a75a7b21e..e86bab3933 100644
--- a/core/shared_library.mk
+++ b/core/shared_library.mk
@@ -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
diff --git a/core/static_library.mk b/core/static_library.mk
index 747db81282..c733b86eb6 100644
--- a/core/static_library.mk
+++ b/core/static_library.mk
@@ -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
 LOCAL_2ND_ARCH_VAR_PREFIX :=
 include $(BUILD_SYSTEM)/static_library_internal.mk