commit 13e95692c152bd270078b72dda494aecb60bbb9b
author Miao Wang <miaowang@google.com> Thu Mar 31 22:25:09 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 31 22:25:09 2016 +0000
tree 6268106a87e2c1846ab6574c333f4bf622a13444
parent 644d5943a78b3d84a21a617e7fd7fcd8cff4500a
parent 2a54eadacced2ad69d39404bcb52b5332761c5ce

Merge "Add librsrt_x86_64.bc and modify the script to update x86_64 prebuilts." into nyc-dev

driver/runtime/Android.mk

diff --git a/driver/runtime/Android.mk b/driver/runtime/Android.mk
index 8db4394..49bc321 100755
--- a/driver/runtime/Android.mk
+++ b/driver/runtime/Android.mk
@@ -215,3 +215,14 @@
 LOCAL_CFLAGS += $(clcore_cflags)
 LOCAL_SRC_FILES := $(clcore_files) $(clcore_files_64)
 include $(LOCAL_PATH)/build_bc_lib.mk
+
+# Build the x86_64 version of the library
+include $(CLEAR_VARS)
+
+BCC_RS_TRIPLE := aarch64-linux-android
+RS_TRIPLE_CFLAGS := -D__x86_64__
+LOCAL_MODULE := librsrt_x86_64.bc
+LOCAL_IS_HOST_MODULE := true
+LOCAL_CFLAGS += $(clcore_cflags) -DARCH_X86_HAVE_SSSE3
+LOCAL_SRC_FILES := $(clcore_x86_files) $(clcore_base_files_64)
+include $(LOCAL_PATH)/build_bc_lib.mk

update_rs_prebuilts.sh

diff --git a/update_rs_prebuilts.sh b/update_rs_prebuilts.sh
index 11b1009..2224d73 100755
--- a/update_rs_prebuilts.sh
+++ b/update_rs_prebuilts.sh
@@ -21,8 +21,8 @@
   SHORT_OSNAME=linux
   SONAME=so
   # Target architectures and their system library names.
-  TARGETS=(arm mips x86 arm64)
-  SYS_NAMES=(generic generic_mips generic_x86 generic_arm64)
+  TARGETS=(arm mips x86 arm64 x86_64)
+  SYS_NAMES=(generic generic_mips generic_x86 generic_arm64 generic_x86_64)
   NUM_CORES=`cat /proc/cpuinfo | grep processor | tail -n 1 | cut -f 2 -d :`
   NUM_CORES=$(($NUM_CORES+1))