diff options
author | Narayan Kamath <narayan@google.com> | 2014-05-28 18:02:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-28 18:02:16 +0000 |
commit | 80aceae89ec88562a9ad5e26ebba73bf7e5fddba (patch) | |
tree | b7c132ef652247a11c0d0fdce33381c94e8e939f /packages/services | |
parent | 8c2a82884953f1354a58ecaeef354ce3f7ed5bed (diff) | |
parent | f4e0bf9fe191ab86ff1dd6ba8060a34826017928 (diff) | |
download | frameworks_base-80aceae89ec88562a9ad5e26ebba73bf7e5fddba.zip frameworks_base-80aceae89ec88562a9ad5e26ebba73bf7e5fddba.tar.gz frameworks_base-80aceae89ec88562a9ad5e26ebba73bf7e5fddba.tar.bz2 |
am f4e0bf9f: am 98993813: am b75b3aaa: Merge "Build PacProcessor for 64 bit."
* commit 'f4e0bf9fe191ab86ff1dd6ba8060a34826017928':
Build PacProcessor for 64 bit.
Diffstat (limited to 'packages/services')
-rw-r--r-- | packages/services/PacProcessor/Android.mk | 2 | ||||
-rw-r--r-- | packages/services/PacProcessor/jni/Android.mk | 1 |
2 files changed, 0 insertions, 3 deletions
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_CERTIFICATE := platform LOCAL_JNI_SHARED_LIBRARIES := libjni_pacprocessor -LOCAL_MULTILIB := 32 - include $(BUILD_PACKAGE) include $(call all-makefiles-under,$(LOCAL_PATH)) 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_SHARED_LIBRARIES := \ LOCAL_MODULE := libjni_pacprocessor LOCAL_MODULE_TAGS := optional -LOCAL_32_BIT_ONLY := true include external/stlport/libstlport.mk |