diff options
| author |  djsollen <djsollen@google.com> | 2014-08-21 13:12:34 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-21 13:12:34 -0700 |
| commit | ed20c9b9c9a10b69f316904f66200e90d647fd49 (patch) | |
| tree | bb740469bda14a83476ca39dda8623ffd6cd1e75 /platform_tools/android | |
| parent | 64bf76722ef06eabf51b55afda9f4ff431e41460 (diff) | |
Fix root level Android.mk to now point to the correct nanobench makefile
R=mtklein@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/494193003
Diffstat (limited to 'platform_tools/android')
| -rw-r--r-- | platform_tools/android/gyp_gen/makefile_writer.py | 2 | ||||
| -rw-r--r-- | platform_tools/android/tests/expectations/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py index dbefa5ee83..d8d0c6196f 100644 --- a/platform_tools/android/gyp_gen/makefile_writer.py +++ b/platform_tools/android/gyp_gen/makefile_writer.py @@ -117,7 +117,7 @@ SKIA_TOOLS = ( # # benchmark (timings) -include $(BASE_PATH)/tools/Android.mk +include $(BASE_PATH)/bench/Android.mk # golden-master (fidelity / regression test) include $(BASE_PATH)/gm/Android.mk diff --git a/platform_tools/android/tests/expectations/Android.mk b/platform_tools/android/tests/expectations/Android.mk index 798fceb421..f5fbc29209 100644 --- a/platform_tools/android/tests/expectations/Android.mk +++ b/platform_tools/android/tests/expectations/Android.mk @@ -156,7 +156,7 @@ include $(BUILD_SHARED_LIBRARY) # # benchmark (timings) -include $(BASE_PATH)/tools/Android.mk +include $(BASE_PATH)/bench/Android.mk # golden-master (fidelity / regression test) include $(BASE_PATH)/gm/Android.mk |