summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-12-06 14:37:31 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-12-06 14:37:31 -0800
commit9a636716a32dbbdff18845dbe2353e34a5d85fc0 (patch)
treebb2c02708c2646a5018024e718704297cf9d87a8
parentf7e4f3074701fa7c28538ad659081c3814dedb37 (diff)
parent30eb17fdd1184d63bcb563914e92dd591af845f1 (diff)
downloadandroid_packages_apps_BluetoothExt-9a636716a32dbbdff18845dbe2353e34a5d85fc0.tar.gz
android_packages_apps_BluetoothExt-9a636716a32dbbdff18845dbe2353e34a5d85fc0.tar.bz2
android_packages_apps_BluetoothExt-9a636716a32dbbdff18845dbe2353e34a5d85fc0.zip
Merge "Bluetooth: Force BluetoothExt to 32-bit"
-rw-r--r--Android.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 4f455e2..2f3a5e2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,10 +24,13 @@ LOCAL_JAVA_LIBRARIES += com.quicinc.wbc
LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard
-LOCAL_REQUIRED_MODULES := libbluetooth_jni bluetooth.default
+LOCAL_REQUIRED_MODULES := bluetooth.default
LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_MULTILIB:= 32
+LOCAL_JNI_SHARED_LIBRARIES:= libbluetooth_jni
+
include $(BUILD_PACKAGE)