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

am: a0fc1bfb73

Change-Id: I2c7091406640ba410c0ebc3429179e0337a6ef08

media/libstagefright/codecs/aacenc/Android.bp

@@ -55,7 +55,7 @@ cc_library_static {
 
             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

@@ -75,7 +75,7 @@ cc_library_static {
 
             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

@@ -35,7 +35,7 @@ cc_library_shared {
         arm: {
             instruction_set: "arm",
 
-            armv7_a_neon: {
+            neon: {
                 cflags: [
                     "-DH264DEC_NEON",
                     "-DH264DEC_OMXDL",