aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-23 22:52:32 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-23 22:52:32 +0000
commit148f497fad5d420297642627bc9b7ac565210101 (patch)
tree899183b8d4e59769a299cb0475d17f8e125e8954
parent6d2ffb9ab7f8de0fc513aebaeff15cbec1354240 (diff)
parent301e0e8ea728c05e0cf98e54a1b5a79ccecba1a8 (diff)
downloadlibyuv-148f497fad5d420297642627bc9b7ac565210101.tar.gz
Snap for 8347268 from 301e0e8ea728c05e0cf98e54a1b5a79ccecba1a8 to mainline-go-ipsec-release
Change-Id: I90002c7ac1e6c21b4b819a0019a3f1e068827f26
-rw-r--r--files/Android.bp6
-rw-r--r--files/CMakeLists.txt2
2 files changed, 1 insertions, 7 deletions
diff --git a/files/Android.bp b/files/Android.bp
index 20b8c234..c1aa8c67 100644
--- a/files/Android.bp
+++ b/files/Android.bp
@@ -86,12 +86,6 @@ 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 188a26b7..ed4948f0 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.12 )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
OPTION( TEST "Built unit tests" OFF )
SET ( ly_base_dir ${PROJECT_SOURCE_DIR} )