commit 77d45c3bd8853abe5ed1e43d73d665277caad0ac
author Naveen Kumar P <naveenkumar.p@ittiam.com> Wed Oct 18 22:12:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 18 22:12:03 2017 +0000
tree 0d57bd1df2c8db8d8b024df19d0cf2955f45fe6c
parent 6cf5a8c462de09ce95eeb9aba7782619bf4e9a5f
parent dc82a1df6da057a05e2110dc9d8a9addaae93932

Fix heap buffer overflow am: f6ba5eae65 am: 578f676115  -s ours am: 6a9bace2ad  -s ours am: 99643a33ee  -s ours am: f2d3dfa37e  -s ours am: a841dbe96d  -s ours am: bbfacae996  -s ours am: c423e12836  -s ours am: 9fa52f5383  -s ours am: 1732a2123a  -s ours am: 9dbd63cef8  -s ours am: 63ad906762  -s ours am: 8a8c2f5ad2  -s ours
am: dc82a1df6d  -s ours

Change-Id: Id413901472435efc21a6b41235e43b76fc934817

Android.bp

diff --git a/Android.bp b/Android.bp
index 2f90c31..579771c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -9,6 +9,11 @@
 
         "-O3",
         "-DANDROID",
+        "-Wall",
+        "-Werror",
+        // common/x86/ihevc_sao_ssse3_intr.c: implicit conversion from
+        // 'int' to 'char' changes value from 128 to -128
+        "-Wno-error=constant-conversion",
     ],
 
     export_include_dirs: [
@@ -192,7 +197,7 @@
 
             instruction_set: "arm",
 
-            armv7_a_neon: {
+            neon: {
                 srcs: [
                     "decoder/arm/ihevcd_function_selector_a9q.c",
                     "common/arm/ihevc_intra_ref_substitution_a9q.c",

test/decoder.mk

diff --git a/test/decoder.mk b/test/decoder.mk
index 6c64ac3..6b343a0 100644
--- a/test/decoder.mk
+++ b/test/decoder.mk
@@ -5,7 +5,9 @@
 LOCAL_MODULE    := hevcdec
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_CFLAGS := -DPROFILE_ENABLE -DARM  -fPIC -DMD5_DISABLE
+LOCAL_CFLAGS := \
+    -DPROFILE_ENABLE -DARM  -fPIC -DMD5_DISABLE \
+    -Wall -Werror
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../decoder $(LOCAL_PATH)/../common $(LOCAL_PATH)/
 LOCAL_SRC_FILES := decoder/main.c
 LOCAL_STATIC_LIBRARIES := libhevcdec