PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: e5734c014f

Change-Id: Ia13c3f4b0940f2089f747d6cf23cc691889f0b25
This commit is contained in:
Tao Bao
2018-08-13 08:47:11 -07:00
committed by android-build-merger
parent 1303267b32 e5734c014f
commit 9c2145d297
7 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Android.mk
+1 -1
View File
@@ -208,7 +208,7 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_TEST_DATA := \ LOCAL_TEST_DATA := \
$(call find-test-data-in-subdirs, $(LOCAL_PATH), "*", testdata) \ $(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) include $(BUILD_NATIVE_TEST)
# Host tests # Host tests
tests/component/resources_test.cpp
+5 -4
View File
@@ -32,10 +32,11 @@
static const std::string kLocale = "zu"; static const std::string kLocale = "zu";
static const std::vector<std::string> kResourceImagesDirs{ "res-mdpi/images/", "res-hdpi/images/", static const std::vector<std::string> kResourceImagesDirs{
"res-xhdpi/images/", "res-testdata/res-mdpi/images/", "res-testdata/res-hdpi/images/",
"res-xxhdpi/images/", "res-testdata/res-xhdpi/images/", "res-testdata/res-xxhdpi/images/",
"res-xxxhdpi/images/" }; "res-testdata/res-xxxhdpi/images/",
};
static int png_filter(const dirent* de) { static int png_filter(const dirent* de) {
if (de->d_type != DT_REG || !android::base::EndsWith(de->d_name, "_text.png")) { if (de->d_type != DT_REG || !android::base::EndsWith(de->d_name, "_text.png")) {
tests/res-testdata/res-hdpi
Symlink
+1
View File
@@ -0,0 +1 @@
../../res-hdpi
tests/res-testdata/res-mdpi
Symlink
+1
View File
@@ -0,0 +1 @@
../../res-mdpi
tests/res-testdata/res-xhdpi
Symlink
+1
View File
@@ -0,0 +1 @@
../../res-xhdpi
tests/res-testdata/res-xxhdpi
Symlink
+1
View File
@@ -0,0 +1 @@
../../res-xxhdpi
tests/res-testdata/res-xxxhdpi
Symlink
+1
View File
@@ -0,0 +1 @@
../../res-xxxhdpi