commit 75e61dba572b8d9d4b4e7f720c107ebf10519438
author Isaac Chen <ycchen@google.com> Tue Sep 26 10:09:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 26 10:09:35 2017 +0000
tree e111e54f23acc312e58b99f03f5087795b8aaf4e
parent 028577e9655d3b81027a6f0e875d439f074720b3
parent 2a49d3737412ad62600d71d0c8095bc8c2175345

Merge "Enable 32-bit armv8 NEON for aac/amrwb/h264 codecs" am: 8798a2dd1e am: a0fc1bfb73 am: abfe8a64bc
am: 2a49d37374

Change-Id: I636f9947f13a0918e2cdf8cfb415466261fa0596

media/libstagefright/codecs/aacenc/Android.bp

diff --git a/media/libstagefright/codecs/aacenc/Android.bp b/media/libstagefright/codecs/aacenc/Android.bp
index fb368c2..1b4e35c 100644
--- a/media/libstagefright/codecs/aacenc/Android.bp
+++ b/media/libstagefright/codecs/aacenc/Android.bp
@@ -56,7 +56,7 @@
 
             instruction_set: "arm",
 
-            armv7_a_neon: {
+            neon: {
                 exclude_srcs: [
                     "src/asm/ARMV5E/PrePostMDCT_v5.s",
                     "src/asm/ARMV5E/R4R8First_v5.s",

media/libstagefright/codecs/amrwbenc/Android.bp

diff --git a/media/libstagefright/codecs/amrwbenc/Android.bp b/media/libstagefright/codecs/amrwbenc/Android.bp
index 8968991..b6f637f 100644
--- a/media/libstagefright/codecs/amrwbenc/Android.bp
+++ b/media/libstagefright/codecs/amrwbenc/Android.bp
@@ -76,7 +76,7 @@
 
             instruction_set: "arm",
 
-            armv7_a_neon: {
+            neon: {
                 exclude_srcs: [
                     "src/asm/ARMV5E/convolve_opt.s",
                     "src/asm/ARMV5E/cor_h_vec_opt.s",

media/libstagefright/codecs/on2/h264dec/Android.bp

diff --git a/media/libstagefright/codecs/on2/h264dec/Android.bp b/media/libstagefright/codecs/on2/h264dec/Android.bp
index 95c2075..6d558b6 100644
--- a/media/libstagefright/codecs/on2/h264dec/Android.bp
+++ b/media/libstagefright/codecs/on2/h264dec/Android.bp
@@ -35,7 +35,7 @@
         arm: {
             instruction_set: "arm",
 
-            armv7_a_neon: {
+            neon: {
                 cflags: [
                     "-DH264DEC_NEON",
                     "-DH264DEC_OMXDL",