From 878bf5c8754de54b7473b695ffd1c66185c9e5ef Mon Sep 17 00:00:00 2001
From: Justin Yun <justinyun@google.com>
Date: Mon, 24 Jul 2017 15:19:44 +0900
Subject: [PATCH 1/2] Mark the module as VNDK or VNDK-SP in Android.bp

As a VNDK/VNDK-SP module, Android.bp must have 'vndk' tag as well
as 'vendor_available: true'.

For a VNDK module, the 'vndk' tag has 'enabled: true'.
It will be installed system/lib(64)/vndk as a vendor variant.

For a VNDK-SP module, the 'vndk' tag has
'support_system_process: true' as well as 'enabled: true'.
It will be installed system/lib(64)/vndk-sp as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Merged-In: I63923fcb6c11a2c331606f5b0b71e9f4c4cd7322
Change-Id: I63923fcb6c11a2c331606f5b0b71e9f4c4cd7322
(cherry picked from commit 062f53fc7310904a6ff18e226b9af00fd3bab58b)
---
 Android.bp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Android.bp b/Android.bp
index 72dcdc5..e15f2f6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,6 +31,9 @@ cc_library_static {
 cc_library_shared {
     name: "libpiex",
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     srcs: [
         "src/tiff_parser.cc",
         "src/piex.cc",

From 1ee57811ecdc88d3ed7b36f0c2b72dfcc86c8fd6 Mon Sep 17 00:00:00 2001
From: Chih-Hung Hsieh <chh@google.com>
Date: Fri, 29 Sep 2017 10:32:27 -0700
Subject: [PATCH 2/2] Use -Werror in external/piex

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Ib4d60122a7cd072d03206f53eb89e4f686f45c1f
---
 Android.bp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Android.bp b/Android.bp
index e15f2f6..d50c18f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,35 +1,41 @@
+cc_defaults {
+    name: "piex_default_cflags",
+    cflags: ["-Wall", "-Werror", "-Wsign-compare"],
+}
+
 cc_library_static {
     name: "libbinary_parse",
+    defaults: ["piex_default_cflags"],
     vendor_available: true,
     srcs: [
         "src/binary_parse/cached_paged_byte_array.cc",
         "src/binary_parse/range_checked_byte_ptr.cc",
     ],
-    cppflags: ["-Wsign-compare"],
 }
 
 cc_library_static {
     name: "libimage_type_recognition",
+    defaults: ["piex_default_cflags"],
     vendor_available: true,
     srcs: [
         "src/image_type_recognition/image_type_recognition_lite.cc",
     ],
     static_libs: ["libbinary_parse"],
-    cppflags: ["-Wsign-compare"],
 }
 
 cc_library_static {
     name: "libtiff_directory",
+    defaults: ["piex_default_cflags"],
     vendor_available: true,
     srcs: [
         "src/tiff_directory/tiff_directory.cc",
     ],
     static_libs: ["libbinary_parse"],
-    cppflags: ["-Wsign-compare"],
 }
 
 cc_library_shared {
     name: "libpiex",
+    defaults: ["piex_default_cflags"],
     vendor_available: true,
     vndk: {
         enabled: true,
@@ -44,5 +50,4 @@ cc_library_shared {
         "libimage_type_recognition",
         "libtiff_directory",
     ],
-    cppflags: ["-Wsign-compare"],
 }