aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-24 18:07:26 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-24 18:07:26 +0000
commit491da6e5b0c5e5fdf6c2d066b4e6244e7791abce (patch)
treeb1c9f59527bc16e125c5556a833b1411704948d1
parent4cb3f77039eecc04c93371c98ac608f852717940 (diff)
parent6d2ffb9ab7f8de0fc513aebaeff15cbec1354240 (diff)
downloadlibyuv-android13-mainline-go-art-release.tar.gz
Snap for 8349661 from 6d2ffb9ab7f8de0fc513aebaeff15cbec1354240 to mainline-go-art-releaseaml_go_art_330913000android13-mainline-go-art-release
Change-Id: Ibed65f01f35b57b04fe8504aab6fb3bd2e0af900
-rw-r--r--files/Android.bp6
-rw-r--r--files/CMakeLists.txt2
2 files changed, 7 insertions, 1 deletions
diff --git a/files/Android.bp b/files/Android.bp
index c1aa8c67..20b8c234 100644
--- a/files/Android.bp
+++ b/files/Android.bp
@@ -86,6 +86,12 @@ cc_library {
"-DHAVE_JPEG",
],
+ arch: {
+ arm: {
+ cflags: ["-mfpu=neon"],
+ },
+ },
+
shared_libs: ["libjpeg"],
export_include_dirs: ["include"],
diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt
index ed4948f0..188a26b7 100644
--- a/files/CMakeLists.txt
+++ b/files/CMakeLists.txt
@@ -3,7 +3,7 @@
# Run with -DTEST=ON to build unit tests
PROJECT ( YUV C CXX ) # "C" is required even for C++ projects
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
OPTION( TEST "Built unit tests" OFF )
SET ( ly_base_dir ${PROJECT_SOURCE_DIR} )