| commit | ed20c9b9c9a10b69f316904f66200e90d647fd49 | [log] [tgz] |
|---|---|---|
| author | djsollen <djsollen@google.com> | Thu Aug 21 13:12:34 2014 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Thu Aug 21 13:12:34 2014 -0700 |
| tree | bb740469bda14a83476ca39dda8623ffd6cd1e75 | |
| 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
diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py index dbefa5e..d8d0c61 100644 --- a/platform_tools/android/gyp_gen/makefile_writer.py +++ b/platform_tools/android/gyp_gen/makefile_writer.py
@@ -117,7 +117,7 @@ # # 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 798fceb..f5fbc29 100644 --- a/platform_tools/android/tests/expectations/Android.mk +++ b/platform_tools/android/tests/expectations/Android.mk
@@ -156,7 +156,7 @@ # # 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