gyp/apptype_console.gypi - Issue 235883015: Generate tests/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: gyp/apptype_console.gypi

Issue 235883015: Generate tests/Android.mk from gyp (Closed) Base URL: https://skia.googlesource.com/skia.git@generate

Patch Set: Remove Android.mk/SkUserConfig.h Created 6 years, 8 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: gyp/apptype_console.gypi

diff --git a/gyp/apptype_console.gypi b/gyp/apptype_console.gypi

index 85cc502da3a06bf8014b78009f94d3418e594521..cde87792c77dd1c844a494e3878b3d909f1568b3 100644

--- a/gyp/apptype_console.gypi

+++ b/gyp/apptype_console.gypi

@@ -12,7 +12,7 @@

'conditions': [

- [ 'skia_os == "android"', {

+ [ 'skia_os == "android" and not skia_android_framework', {

'dependencies': [

'android_deps.gyp:Android_EntryPoint',

'android_system.gyp:skia_launcher',

« no previous file with comments | « no previous file | gyp/tests.gyp » ('j') | no next file with comments »