Merge aosp/master into aosp/cuttlefish-testing
BUG: 117324326
Test: Local build and boot on aosp/pie-cuttlefish-testing
Change-Id: I6d51cbaf5f8cd887075acfc405bc0d5045a9c92a
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 5a4e85a..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "third_party/googletest"]
- path = third_party/googletest
- url = https://github.com/google/googletest.git
diff --git a/src/Android.mk b/src/Android.mk
index 9c6513a..366b76b 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -111,6 +111,7 @@
-Wno-unused-value \
-Wno-unused-variable \
-Wno-implicit-exception-spec-mismatch \
+ -Wno-implicit-fallthrough \
-Wno-overloaded-virtual \
-Wno-non-virtual-dtor \
-Wno-attributes \
diff --git a/src/OpenGL/compiler/Android.mk b/src/OpenGL/compiler/Android.mk
index 07d9b6c..bc9d439 100644
--- a/src/OpenGL/compiler/Android.mk
+++ b/src/OpenGL/compiler/Android.mk
@@ -29,6 +29,7 @@
-Wno-unused-parameter \
-Wno-unused-variable \
-Wno-implicit-exception-spec-mismatch \
+ -Wno-implicit-fallthrough \
-Wno-overloaded-virtual \
-Wno-attributes \
-Wno-unknown-attributes \
diff --git a/src/OpenGL/libEGL/Android.mk b/src/OpenGL/libEGL/Android.mk
index f62cbdd..9d4c9217 100644
--- a/src/OpenGL/libEGL/Android.mk
+++ b/src/OpenGL/libEGL/Android.mk
@@ -13,6 +13,7 @@
-Wno-unused-function \
-Wno-unused-parameter \
-Wno-implicit-exception-spec-mismatch \
+ -Wno-implicit-fallthrough \
-Wno-overloaded-virtual \
-Wno-attributes \
-Wno-unknown-attributes \
diff --git a/src/OpenGL/libGLES_CM/Android.mk b/src/OpenGL/libGLES_CM/Android.mk
index 30be9ba..3d0f0db 100644
--- a/src/OpenGL/libGLES_CM/Android.mk
+++ b/src/OpenGL/libGLES_CM/Android.mk
@@ -20,6 +20,7 @@
-Wno-unused-parameter \
-Wno-unused-variable \
-Wno-implicit-exception-spec-mismatch \
+ -Wno-implicit-fallthrough \
-Wno-overloaded-virtual \
-Wno-attributes \
-Wno-unknown-attributes \
diff --git a/src/OpenGL/libGLESv2/Android.mk b/src/OpenGL/libGLESv2/Android.mk
index b4b98fe..f4babfe 100644
--- a/src/OpenGL/libGLESv2/Android.mk
+++ b/src/OpenGL/libGLESv2/Android.mk
@@ -20,6 +20,7 @@
-Wno-unused-private-field \
-Wno-unused-variable \
-Wno-implicit-exception-spec-mismatch \
+ -Wno-implicit-fallthrough \
-Wno-overloaded-virtual \
-Wno-attributes \
-Wno-unknown-attributes \
diff --git a/src/Reactor/Android.mk b/src/Reactor/Android.mk
index fa90a1a..4e3ac60 100644
--- a/src/Reactor/Android.mk
+++ b/src/Reactor/Android.mk
@@ -116,6 +116,7 @@
-Wno-error=unused-lambda-capture \
-Wno-unused-parameter \
-Wno-implicit-exception-spec-mismatch \
+ -Wno-implicit-fallthrough \
-Wno-overloaded-virtual \
-Wno-non-virtual-dtor \
-Wno-unknown-warning-option
diff --git a/third_party/LLVM/Android.mk b/third_party/LLVM/Android.mk
index a07ca23..23f7d78 100644
--- a/third_party/LLVM/Android.mk
+++ b/third_party/LLVM/Android.mk
@@ -401,6 +401,7 @@
-Wall \
-Werror \
-Wno-implicit-exception-spec-mismatch \
+ -Wno-implicit-fallthrough \
-Wno-overloaded-virtual \
-Wno-undefined-var-template \
-Wno-unneeded-internal-declaration \
diff --git a/third_party/googletest b/third_party/googletest
deleted file mode 160000
index ecd5308..0000000
--- a/third_party/googletest
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ecd530865cefdfa7dea58e84f6aa1b548950363d
