platform_tools/android/gyp_gen/gypd_parser.py - Issue 282053002: Generate bench/Android.mk from gyp.

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/gypd_parser.py

Issue 282053002: Generate bench/Android.mk from gyp. (Closed) Base URL: https://skia.googlesource.com/skia.git@baselines

Patch Set: Remove modifications to generated files to submit. Created 6 years, 7 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:

Index: platform_tools/android/gyp_gen/gypd_parser.py

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

index b0e1417046c872720823361be876932aec6ba9c3..e992637637948a3c8d5cb4ab31c4c339882b6675 100644

--- a/platform_tools/android/gyp_gen/gypd_parser.py

+++ b/platform_tools/android/gyp_gen/gypd_parser.py

@@ -97,6 +97,9 @@ def parse_dictionary(var_dict, d, current_target_name, dest_dir):

# wants relative to dest_dir.

rel_include = os.path.relpath(include, os.pardir)

rel_include = os.path.relpath(rel_include, dest_dir)

+ # No need to include the base directory.

+ if rel_include is os.curdir:

+ continue

rel_include = os.path.join('$(LOCAL_PATH)', rel_include)

# Remove a trailing slash, if present.