platform_tools/android/gyp_gen/makefile_writer.py - Issue 494193003: Fix root level Android.mk to now point to the correct nanobench makefile

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: platform_tools/android/gyp_gen/makefile_writer.py

Issue 494193003: Fix root level Android.mk to now point to the correct nanobench makefile (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: platform_tools/android/gyp_gen/makefile_writer.py

diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py

index 55a71d00ca00b14ae4e9e078a1f197e36afea9f0..fc034ecaf53a3cf1389d80780d94b71ea2e812d4 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

« no previous file with comments | « no previous file | platform_tools/android/tests/expectations/Android.mk » ('j') | no next file with comments »