Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: Ia56f1bdba11cd51f56112380f7efce84c797e22b
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index aa2072c..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@
-[submodule "doc"]
- path = doc
- url = https://github.com/gflags/gflags.git
- branch = gh-pages
diff --git a/Android.bp b/Android.bp
index 7990b05..690232e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-cc_library_static {
+cc_library {
name: "libgflags",
host_supported: true,
vendor_available: true,
@@ -14,6 +14,8 @@
"-DHAVE_PTHREAD",
"-Wall",
"-Werror",
+ "-Wno-implicit-fallthrough",
+ // gflags_completions.cc:326,327 have unannotated fall-through
],
export_include_dirs: [
"android",
diff --git a/doc b/doc
deleted file mode 160000
index 971dd2a..0000000
--- a/doc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 971dd2a4fadac9cdab174c523c22df79efd63aa5
