commit 98993813b31f20c27f2c0a91daebdaedc382bb5b
author Narayan Kamath <narayan@google.com> Wed May 28 08:48:23 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 28 08:48:23 2014 +0000
tree 0eeab3c3c02d47966b3a600cfd12a5da51213073
parent 34c6cb4c1af7a7dd8f8658dd401c74076943ffb8
parent b75b3aaac4f0282a99bb4486b5dce51a87bc0dd7

am b75b3aaa: Merge "Build PacProcessor for 64 bit."

* commit 'b75b3aaac4f0282a99bb4486b5dce51a87bc0dd7':
  Build PacProcessor for 64 bit.

packages/services/PacProcessor/Android.mk

diff --git a/packages/services/PacProcessor/Android.mk b/packages/services/PacProcessor/Android.mk
index 79f8a1f..3c4e951 100644
--- a/packages/services/PacProcessor/Android.mk
+++ b/packages/services/PacProcessor/Android.mk
@@ -27,8 +27,6 @@
 
 LOCAL_JNI_SHARED_LIBRARIES := libjni_pacprocessor
 
-LOCAL_MULTILIB := 32
-
 include $(BUILD_PACKAGE)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))

packages/services/PacProcessor/jni/Android.mk

diff --git a/packages/services/PacProcessor/jni/Android.mk b/packages/services/PacProcessor/jni/Android.mk
index 8a60927..f16c90b 100644
--- a/packages/services/PacProcessor/jni/Android.mk
+++ b/packages/services/PacProcessor/jni/Android.mk
@@ -35,7 +35,6 @@
 
 LOCAL_MODULE := libjni_pacprocessor
 LOCAL_MODULE_TAGS := optional
-LOCAL_32_BIT_ONLY := true
 
 include external/stlport/libstlport.mk