platform_tools/android/gyp_gen/tool_makefile_writer.py - Issue 1696483002: Update Android framework makefile to build static and shared libs

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

Issue 1696483002: Update Android framework makefile to build static and shared libs (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: new test Created 4 years, 10 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/tool_makefile_writer.py

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

index 2fef11009d56b9cc05508170231695e1f5159d85..4c1174fa59554d7dbda3af98793d19a324ec4cd0 100644

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

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

@@ -35,12 +35,13 @@ def write_tool_android_mk(target_dir, var_dict):

with open(target_file, 'w') as f:

f.write(makefile_writer.AUTOGEN_WARNING)

- makefile_writer.write_local_path(f)

- makefile_writer.write_clear_vars(f)

+ f.write(makefile_writer.LOCAL_PATH)

+ f.write(makefile_writer.CLEAR_VARS)

makefile_writer.write_local_vars(f, var_dict, False, None)

f.write(SKIA_RESOURCES)

+ f.write('include $(LOCAL_PATH)/../skia_static_deps.mk\n')

f.write('include $(BUILD_NATIVE_TEST)\n')

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