commit 70b35fd6b8b234c1710713d76c2db7b1edc000f0
author Elliott Hughes <enh@google.com> Fri Jan 31 16:41:14 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 31 16:41:14 2014 +0000
tree 1f202dcd7a9d1b00fcfb340f91297cf5d0d2b9d6
parent daea762e03f303263f320cc02c523c8c591c87c7
parent 7dc91f8cfae2cc71343fa0b914f339e55dd428a1

am 7dc91f8c: am 8623972d: Merge "Don\'t try to build libcorkscrew for LP64."

* commit '7dc91f8cfae2cc71343fa0b914f339e55dd428a1':
  Don't try to build libcorkscrew for LP64.

libcorkscrew/Android.mk

diff --git a/libcorkscrew/Android.mk b/libcorkscrew/Android.mk
index e275317..f96fc4e 100644
--- a/libcorkscrew/Android.mk
+++ b/libcorkscrew/Android.mk
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ifeq ($(TARGET_IS_64_BIT), false)
+
 LOCAL_PATH:= $(call my-dir)
 
 generic_src_files := \
@@ -96,3 +98,5 @@
 include $(BUILD_HOST_EXECUTABLE)
 
 endif # HOST_ARCH == x86
+
+endif # TARGET_IS_64_BIT == false