Merge "tests: Create res-testdata for testdata pickup." am: 2cc6211165

am: e5734c014f

Change-Id: Ia13c3f4b0940f2089f747d6cf23cc691889f0b25

tests/Android.mk

@@ -208,7 +208,7 @@ LOCAL_STATIC_LIBRARIES := \
 
 LOCAL_TEST_DATA := \
     $(call find-test-data-in-subdirs, $(LOCAL_PATH), "*", testdata) \
-    $(call find-test-data-in-subdirs, bootable/recovery, "*_text.png", res-*)
+    $(call find-test-data-in-subdirs, $(LOCAL_PATH), "*_text.png", res-testdata)
 include $(BUILD_NATIVE_TEST)
 
 # Host tests

tests/component/resources_test.cpp

@@ -32,10 +32,11 @@
 
 static const std::string kLocale = "zu";
 
-static const std::vector<std::string> kResourceImagesDirs{ "res-mdpi/images/", "res-hdpi/images/",
-                                                           "res-xhdpi/images/",
-                                                           "res-xxhdpi/images/",
-                                                           "res-xxxhdpi/images/" };
+static const std::vector<std::string> kResourceImagesDirs{
+  "res-testdata/res-mdpi/images/",    "res-testdata/res-hdpi/images/",
+  "res-testdata/res-xhdpi/images/",   "res-testdata/res-xxhdpi/images/",
+  "res-testdata/res-xxxhdpi/images/",
+};
 
 static int png_filter(const dirent* de) {
   if (de->d_type != DT_REG || !android::base::EndsWith(de->d_name, "_text.png")) {

tests/res-testdata/res-hdpi

@@ -0,0 +1 @@
+../../res-hdpi

tests/res-testdata/res-mdpi

@@ -0,0 +1 @@
+../../res-mdpi

tests/res-testdata/res-xhdpi

@@ -0,0 +1 @@
+../../res-xhdpi

tests/res-testdata/res-xxhdpi

@@ -0,0 +1 @@
+../../res-xxhdpi

tests/res-testdata/res-xxxhdpi

@@ -0,0 +1 @@
+../../res-xxxhdpi