Index: gyp/apptype_console.gypi |
diff --git a/gyp/apptype_console.gypi b/gyp/apptype_console.gypi |
index 906bea814d1ea64f72e2f8b1e41524a1f2592699..d3759419a10bcf8c45c5d6773b95662dd6c91505 100644 |
--- a/gyp/apptype_console.gypi |
+++ b/gyp/apptype_console.gypi |
@@ -12,10 +12,17 @@ |
}, |
}, |
'conditions': [ |
- [ 'skia_os == "android" and not skia_android_framework', { |
+ [ 'skia_os == "android"', { |
+ 'conditions': [ |
+ ['skia_android_framework == 0', { |
+ 'dependencies': [ |
+ 'android_deps.gyp:Android_EntryPoint', |
+ 'skia_launcher.gyp:skia_launcher', |
+ ], |
+ }], |
+ ], |
'dependencies': [ |
- 'android_deps.gyp:Android_EntryPoint', |
- 'skia_launcher.gyp:skia_launcher', |
+ 'android_output.gyp:android_output', |
], |
}], |
[ 'skia_os == "nacl"', { |