From 1e1fb3d684ee79ab869581e9bf06e43be39f5138 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Tue, 1 Jun 2021 16:56:02 -0700
Subject: Always use Neon.

This library cannot be built without Neon. The NDK sysroot build
generates non-Neon artifacts but also needs to build this library to
perform ABI checking. This is only the implementation and not a
component distributed with the NDK, so it's not important that this be
built non-Neon.

Test: build/soong/scripts/build-ndk-prebuilts.sh
Bug: http://b/156513478
Change-Id: If3ff6be7ad53cbdcc32ac8a0baa2f98f78c646ad
---
 files/Android.bp | 6 ++++++
 1 file changed, 6 insertions(+)

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"],
-- 
cgit v1.2.3


From 7f039ec157b9bd52ca10565da22418a2f3cffb92 Mon Sep 17 00:00:00 2001
From: Fred Sladkey <fsladkey@google.com>
Date: Fri, 14 Jan 2022 15:27:59 +0000
Subject: Update CMake min version so that CMake 3.22.1 doesn't log a warning

Change-Id: If16bf29b9e2f164eeffd5a0792455880142653df
---
 files/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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} )
-- 
cgit v1.2.3