diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:05:38 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:05:38 +0000 |
commit | 0e64797b92ae23d10f78a1f45b3fffe2eeff558b (patch) | |
tree | b1c9f59527bc16e125c5556a833b1411704948d1 | |
parent | 301e0e8ea728c05e0cf98e54a1b5a79ccecba1a8 (diff) | |
parent | 6d2ffb9ab7f8de0fc513aebaeff15cbec1354240 (diff) | |
download | libyuv-0e64797b92ae23d10f78a1f45b3fffe2eeff558b.tar.gz |
Snap for 8570526 from 6d2ffb9ab7f8de0fc513aebaeff15cbec1354240 to mainline-scheduling-releaseaml_sch_331113000aml_sch_331111000android13-mainline-scheduling-release
Change-Id: I058c576c75c974481709f8df0dfe60631533bb30
-rw-r--r-- | files/Android.bp | 6 | ||||
-rw-r--r-- | files/CMakeLists.txt | 2 |
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} ) |