Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I24af49b9e678348f42ec5061be42215ae6be6133
diff --git a/Android.bp b/Android.bp
index 711e2d2..8c2f9c7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,6 +2,7 @@
name: "libtinyxml2",
host_supported: true,
vendor_available: true,
+ recovery_available: true,
vndk: {
enabled: true,
},
@@ -11,6 +12,8 @@
cflags: [
"-Wall",
"-Werror",
+ "-Wno-implicit-fallthrough",
+ // tinyxml2.cpp line 436, 441, 446 have -Wimplicit-fallthrough.
],
shared_libs: ["liblog"],
@@ -32,12 +35,7 @@
name: "tinyxml2-tests",
srcs: ["xmltest.cpp"],
shared_libs: ["libtinyxml2"],
- // "resources/*" doesn't work: http://b/71906438
data: [
- "resources/dream.xml",
- "resources/empty.xml",
- "resources/out/readme.txt",
- "resources/utf8testverify.xml",
- "resources/utf8test.xml",
+ "resources/**/*",
],
}