commit a1da944733a43cc84172934e4f7ec40ba4a95af2
author Tobias Thierer <tobiast@google.com> Fri Feb 09 09:56:59 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 09 09:56:59 2018 +0000
tree bc3f15627a21bdd3e92317f986065df1f818fe78
parent 94087fa71a3255799ac0019f575c2b317766af9f
parent 56fe18f9e0535c56d506b17106dc18be0b64a1a5

Merge "Revert "Move neon block to arm level for libvpx""

Android.bp

diff --git a/Android.bp b/Android.bp
index 950ab3c..7f921c6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2082,9 +2082,15 @@
             // Want arm, not thumb, optimized
             instruction_set: "arm",
 
-            srcs: libvpx_arm_neon_c_srcs,
-            generated_sources: ["libvpx_arm_neon_asm_srcs_converted"],
-            local_include_dirs: ["config/arm-neon"],
+            srcs: libvpx_arm_c_srcs,
+            local_include_dirs: ["config/arm"],
+
+            neon: {
+                exclude_srcs: libvpx_arm_c_srcs,
+                srcs: libvpx_arm_neon_c_srcs,
+                generated_sources: ["libvpx_arm_neon_asm_srcs_converted"],
+                local_include_dirs: ["config/arm-neon"],
+            },
         },
 
         arm64: {

Android.bp.in

diff --git a/Android.bp.in b/Android.bp.in
index 0ad23b3..ac6a464 100644
--- a/Android.bp.in
+++ b/Android.bp.in
@@ -24,9 +24,15 @@
             // Want arm, not thumb, optimized
             instruction_set: "arm",
 
-            srcs: libvpx_arm_neon_c_srcs,
-            generated_sources: ["libvpx_arm_neon_asm_srcs_converted"],
-            local_include_dirs: ["config/arm-neon"],
+            srcs: libvpx_arm_c_srcs,
+            local_include_dirs: ["config/arm"],
+
+            neon: {
+                exclude_srcs: libvpx_arm_c_srcs,
+                srcs: libvpx_arm_neon_c_srcs,
+                generated_sources: ["libvpx_arm_neon_asm_srcs_converted"],
+                local_include_dirs: ["config/arm-neon"],
+            },
         },
 
         arm64: {