commit 6fc9b087030be0856979c7b9e9a13df7e76c50d2
author Bill Yi <byi@google.com> Wed Oct 24 14:45:56 2018 -0700
committer Bill Yi <byi@google.com> Wed Oct 24 14:45:56 2018 -0700
tree 3246d1472ae648d62b5f4ccd02de7fb16072a667
parent 507c789494f4cecc95412cb33dd6f59201a4bb49
parent 2d51233a7a1c823dbd2e10bde4b860130fc33a8e

Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: Ic39005c4e61fe9b4cd6994be03975291240bda19

Android.bp

diff --git a/Android.bp b/Android.bp
index 4f16430..d7a6488 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,6 +17,8 @@
         "-DJSON_USE_EXCEPTION=0",
         "-Wall",
         "-Werror",
+        "-Wno-implicit-fallthrough",
+        // src/lib_json/json_reader.cpp:210  has -Wno-implicit-fallthrough
     ],
 
     target: {
@@ -26,7 +28,7 @@
     },
 }
 
-cc_library_static {
+cc_library {
     name: "libjsoncpp",
     defaults: ["libjsoncpp_defaults"],
     vendor_available: true,