diff options
| author |  scroggo <scroggo@google.com> | 2014-11-07 06:02:20 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-07 06:02:20 -0800 |
| commit | 978d37b343e7de470ce47017ee2b43fc04ea2061 (patch) | |
| tree | 1fedd2fcb92ec1b60fd49e0c283994346a2d9fa5 /platform_tools | |
| parent | 38e13adc18555f8e75f5ae6762e7c307214ae37f (diff) | |
Add LOCAL_PICKUP_FILES to dm and bench makefiles.
Update the generator to include a line for LOCAL_PICKUP_FILES. When
generating makefiles for our tests, they will now have the following line:
LOCAL_PICKUP_FILES := \
$(LOCAL_PATH)/../resources
This allows testing infrastructure to pick up resource files used by
our tests.
Update expectations files to test LOCAL_PICKUP_FILES.
BUG=skia:2454
Review URL: https://codereview.chromium.org/704393002
Diffstat (limited to 'platform_tools')
| -rw-r--r-- | platform_tools/android/gyp_gen/tool_makefile_writer.py | 3 | ||||
| -rw-r--r-- | platform_tools/android/tests/expectations/tool/Android.mk | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/platform_tools/android/gyp_gen/tool_makefile_writer.py b/platform_tools/android/gyp_gen/tool_makefile_writer.py index 451b2010ef..0bf7e129e3 100644 --- a/platform_tools/android/gyp_gen/tool_makefile_writer.py +++ b/platform_tools/android/gyp_gen/tool_makefile_writer.py @@ -31,6 +31,9 @@ def write_tool_android_mk(target_dir, var_dict): makefile_writer.write_local_vars(f, var_dict, False, None) + makefile_writer.write_group(f, 'LOCAL_PICKUP_FILES', + ['$(LOCAL_PATH)/../resources'], False) + makefile_writer.write_include_stlport(f) f.write('include $(BUILD_NATIVE_TEST)\n') diff --git a/platform_tools/android/tests/expectations/tool/Android.mk b/platform_tools/android/tests/expectations/tool/Android.mk index 0affe474b5..ea990e9133 100644 --- a/platform_tools/android/tests/expectations/tool/Android.mk +++ b/platform_tools/android/tests/expectations/tool/Android.mk @@ -37,5 +37,8 @@ LOCAL_MODULE_TAGS := \ LOCAL_MODULE := \ local_module +LOCAL_PICKUP_FILES := \ + $(LOCAL_PATH)/../resources + include external/stlport/libstlport.mk include $(BUILD_NATIVE_TEST) |