commit 8fc003e205e2c9ec2860a34e8cfdc2f81a76cb93
author Xin Li <delphij@google.com> Mon May 13 15:39:08 2019 -0700
committer Xin Li <delphij@google.com> Mon May 13 15:39:08 2019 -0700
tree b244ef1302ba54deea6cdf9c0082d8564774d03b
parent d3539c5765d13f7fc6d715f90a45449ef855f979
parent 7b42c48cc6fb88940760d20bee321bff1664286e

DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master

Bug: 132622481
Change-Id: I412fce0a111b51a5a56bb455cb3588d92ceb30ec

Android.bp

diff --git a/Android.bp b/Android.bp
index 4abfa16..db39f62 100644
--- a/Android.bp
+++ b/Android.bp
@@ -9,6 +9,7 @@
         "-Wall",
         "-Werror",
         "-Wno-unused-variable",
+        "-Wno-null-pointer-arithmetic",
     ],
 
     export_include_dirs: [

decoder/ih264d_dpb_mgr.c

diff --git a/decoder/ih264d_dpb_mgr.c b/decoder/ih264d_dpb_mgr.c
index b7ee498..74ecdb5 100644
--- a/decoder/ih264d_dpb_mgr.c
+++ b/decoder/ih264d_dpb_mgr.c
@@ -18,8 +18,7 @@
  * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore
 */
 #ifdef __ANDROID__
-#include "log/log.h"
-#include <cutils/log.h>
+#include <log/log.h>
 #endif
 #include "ih264_typedefs.h"
 #include "ih264_macros.h"

test/Android.bp

diff --git a/test/Android.bp b/test/Android.bp
index 9e34a51..2a5b6c7 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -27,7 +27,6 @@
         "-DARM",
         "-DMD5_DISABLE",
         "-fPIC",
-        "-pie",
         "-Wall",
         "-Werror",
         "-Wno-unused-variable",