commit 27ba7e054ed80a1fcd0fc520ad4734285129490c
author android-build-prod (mdb) <android-build-team-robot@google.com> Thu Apr 26 09:16:45 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 26 09:16:45 2018 -0700
tree aa889ef18555d456e35da393eeaab9ed84f755bb
parent 2399db2c26ccd68d4226e2aad57d98e3e60c0a7b
parent af9785313842ddd86a430c7ef70d5fc595a12144

Merge "Remove workaround for a fixed bug." am: c4a167426f
am: af97853138

Change-Id: Ie2b0e61877bf782fe56ab05099389577ecb711ab

Android.bp

diff --git a/Android.bp b/Android.bp
index 711e2d2..a12e0ba 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,12 +32,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/**/*",
     ],
 }