commit abfe8a64bce4eaeb0f6428cd0c8faf64c279aeb5
author Isaac Chen <ycchen@google.com> Tue Sep 26 10:02:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 26 10:02:35 2017 +0000
tree d47038f0b98c56237a0e3465ecde2defd73abc57
parent acc2d29e13d75dbc5cb953adcae1ce340f54a511
parent a0fc1bfb730bc5a9a0ea2a94b5831300b77de793

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

Change-Id: I2c7091406640ba410c0ebc3429179e0337a6ef08

media/libstagefright/codecs/aacenc/Android.bp

diff --git a/media/libstagefright/codecs/aacenc/Android.bp b/media/libstagefright/codecs/aacenc/Android.bp
index 1a7ffca..0a8e40c 100644
--- a/media/libstagefright/codecs/aacenc/Android.bp
+++ b/media/libstagefright/codecs/aacenc/Android.bp
@@ -55,7 +55,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 5c5a122..eb27388 100644
--- a/media/libstagefright/codecs/amrwbenc/Android.bp
+++ b/media/libstagefright/codecs/amrwbenc/Android.bp
@@ -75,7 +75,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",