Don't override target to 32 for Bluetooth

Change-Id: I1f72dec4376bb55e72d15df5af548cf4ce123c31

diff --git a/Android.mk b/Android.mk
index 65f08b6..2f58be0 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -7,7 +7,6 @@ LOCAL_SRC_FILES := \
         $(call all-java-files-under, lib/mapapi)
 
 LOCAL_MODULE := bluetooth.mapsapi
-LOCAL_MULTILIB := 32
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -27,7 +26,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard bluetooth.mapsapi sap-api-java-
 LOCAL_PROTOC_OPTIMIZE_TYPE := micro
 
 LOCAL_REQUIRED_MODULES := bluetooth.default
-LOCAL_MULTILIB := 32
 
 LOCAL_PROGUARD_ENABLED := disabled
 

diff --git a/jni/Android.mk b/jni/Android.mk
index d1428e4..fe5c482 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -28,8 +28,6 @@ LOCAL_SHARED_LIBRARIES := \
     liblog \
     libhardware
 
-LOCAL_MULTILIB := 32
-
 LOCAL_CFLAGS += -Wall -Wextra -Wno-unused-parameter
 
 LOCAL_MODULE := libbluetooth_jni