ref: bd863314d01a3024e94934d9a6418a937d9f2ec4
parent: 124ada514b04f8219655e52f087ec94170bfe111
parent: 5da87e84d588abe5de3b9461e074cb5436c6f3f5
author: James Zern <[email protected]>
date: Tue Jul 28 17:50:35 EDT 2015
Merge "build/make/Android.mk: support TARGET_ARCH_ABI=x86_64"
--- a/README
+++ b/README
@@ -85,6 +85,7 @@
x86-win32-vs10
x86-win32-vs11
x86-win32-vs12
+ x86_64-android-gcc
x86_64-darwin9-gcc
x86_64-darwin10-gcc
x86_64-darwin11-gcc
--- a/build/make/Android.mk
+++ b/build/make/Android.mk
@@ -67,6 +67,8 @@
LOCAL_ARM_MODE := arm
else ifeq ($(TARGET_ARCH_ABI),x86)
include $(CONFIG_DIR)libs-x86-android-gcc.mk
+else ifeq ($(TARGET_ARCH_ABI),x86_64)
+ include $(CONFIG_DIR)libs-x86_64-android-gcc.mk
else ifeq ($(TARGET_ARCH_ABI),mips)
include $(CONFIG_DIR)libs-mips-android-gcc.mk
else
--- a/configure
+++ b/configure
@@ -132,6 +132,7 @@
all_platforms="${all_platforms} x86-win32-vs10" all_platforms="${all_platforms} x86-win32-vs11" all_platforms="${all_platforms} x86-win32-vs12"+all_platforms="${all_platforms} x86_64-android-gcc" all_platforms="${all_platforms} x86_64-darwin9-gcc" all_platforms="${all_platforms} x86_64-darwin10-gcc" all_platforms="${all_platforms} x86_64-darwin11-gcc"