Merge changes Iee2dac1d,I1886db25 into ndk-r14-release
* changes:
Add a test to verify cmake neon asm.
Move GCC over to make-package.
diff --git a/build/tools/build-gcc.py b/build/tools/build-gcc.py
index ce34dd8..d387505 100755
--- a/build/tools/build-gcc.py
+++ b/build/tools/build-gcc.py
@@ -17,7 +17,6 @@
"""Packages the platform's GCC for the NDK."""
import os
import site
-import subprocess
import sys
site.addsitedir(os.path.join(os.path.dirname(__file__), '../lib'))
@@ -50,13 +49,9 @@
toolchain_name = toolchain + '-' + version
prebuilt_path = get_gcc_prebuilt_path(host_tag)
- package_name = 'gcc-{}-{}.zip'.format(toolchain, host_tag)
- package_path = os.path.join(package_dir, package_name)
- if os.path.exists(package_path):
- os.unlink(package_path)
- os.chdir(prebuilt_path)
- subprocess.check_call(
- ['zip', '-9qr', package_path, toolchain_name])
+ package_name = 'gcc-{}-{}'.format(toolchain, host_tag)
+ built_path = os.path.join(prebuilt_path, toolchain_name)
+ build_support.make_package(package_name, built_path, package_dir)
def main(args):
@@ -66,7 +61,8 @@
if args.arch is not None:
arches = [args.arch]
- toolchains = sorted(set([build_support.arch_to_toolchain(arch) for arch in arches]))
+ toolchains = sorted(
+ set([build_support.arch_to_toolchain(arch) for arch in arches]))
host_tag = build_support.host_to_tag(args.host)
for toolchain in toolchains:
package_gcc(args.dist_dir, host_tag, toolchain, GCC_VERSION)
diff --git a/tests/build/neon-asm/CMakeLists.txt b/tests/build/neon-asm/CMakeLists.txt
new file mode 100644
index 0000000..56f367b
--- /dev/null
+++ b/tests/build/neon-asm/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.6.0)
+
+enable_language(ASM)
+add_library(neon-asm STATIC jni/foo.S)
diff --git a/tests/build/neon-asm/jni/Android.mk b/tests/build/neon-asm/jni/Android.mk
new file mode 100644
index 0000000..24d1817
--- /dev/null
+++ b/tests/build/neon-asm/jni/Android.mk
@@ -0,0 +1,7 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := foo
+LOCAL_SRC_FILES := foo.S
+LOCAL_CFLAGS := -mfpu=neon
+include $(BUILD_STATIC_LIBRARY)
diff --git a/tests/build/neon-asm/jni/Application.mk b/tests/build/neon-asm/jni/Application.mk
new file mode 100644
index 0000000..ce09535
--- /dev/null
+++ b/tests/build/neon-asm/jni/Application.mk
@@ -0,0 +1 @@
+APP_STL := c++_static
diff --git a/tests/build/neon-asm/jni/foo.S b/tests/build/neon-asm/jni/foo.S
new file mode 100644
index 0000000..984b71e
--- /dev/null
+++ b/tests/build/neon-asm/jni/foo.S
@@ -0,0 +1,3 @@
+.if __ARM_NEON__ != 1
+__ARM_NEON__ != 1
+.endif
diff --git a/tests/build/neon-asm/test_config.py b/tests/build/neon-asm/test_config.py
new file mode 100644
index 0000000..6df46e2
--- /dev/null
+++ b/tests/build/neon-asm/test_config.py
@@ -0,0 +1,8 @@
+def build_unsupported(abi, api, toolchain):
+ if abi != 'armeabi-v7a':
+ return abi
+ return None
+
+
+def extra_cmake_flags():
+ return ['-DANDROID_ARM_NEON=ON']
