platform_tools/android/bin/gyp_to_android.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/bin/gyp_to_android.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: rebaseline 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/bin/gyp_to_android.py

diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py

index 9ce330c4222edba5d0c916e591f1af99293731fa..4261b5f33bc5455998e31b7e3ff6e302494b675d 100755

--- a/platform_tools/android/bin/gyp_to_android.py

+++ b/platform_tools/android/bin/gyp_to_android.py

@@ -195,6 +195,9 @@ def main(target_dir=None, require_sk_user_config=False, gyp_source_dir=None):

makefile_writer.write_android_mk(target_dir=target_dir,

common=common, deviations_from_common=deviations_from_common)

+ makefile_writer.write_static_includes_mk(target_dir=target_dir,

+ common=common, deviations_from_common=deviations_from_common)

finally:

shutil.rmtree(tmp_folder)

« gyp/bench.gyp ('K') | « gyp/dm.gyp ('k') | platform_tools/android/gyp_gen/makefile_writer.py » ('j') | platform_tools/android/gyp_gen/makefile_writer.py » ('J')