Merge "Update num_mbs_left When mb_x is Reset." into mnc-dev am: f7cc570a1d am: 6885bab2da am: 8ffb648d7a am: eba2dd32e8 am: 0d619bbda7 am: 292b3a4f21 am: 698fb39b5b am: e71fb91532 am: 63f5d9175e am: acb848030b am: d3267de10e
am: 43161c2cbf

Change-Id: Ia6ae9e8793448d381e202b0c301d6d4256ce2de7
diff --git a/Android.bp b/Android.bp
index 2eff420..c5487c3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,7 +65,7 @@
                 "common/arm/ideint_function_selector.c",
             ],
 
-            armv7_a_neon: {
+            neon: {
                 srcs: [
                     "decoder/arm/impeg2d_function_selector_a9q.c",
                     "common/arm/ideint_function_selector_a9.c",
diff --git a/test/Android.bp b/test/Android.bp
index d1cbc2b..f17489e 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -6,6 +6,8 @@
         "-DMD5_DISABLE",
         "-DARM",
         "-fPIC",
+        "-Wall",
+        "-Werror",
     ],
     local_include_dirs: [
         "decoder/",