Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / gyp / apptype_console.gypi

diff --git a/src/third_party/skia/gyp/apptype_console.gypi b/src/third_party/skia/gyp/apptype_console.gypi
index b9c1ff6..cde8779 100644 (file)
--- a/src/third_party/skia/gyp/apptype_console.gypi
+++ b/src/third_party/skia/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',
@@ -34,19 +34,15 @@
           '../include/views',
           '../include/xml',
           '../include/utils/mac',
+          '../src/views/mac',
         ],
         'sources': [
           '../src/views/ios/SkOSWindow_iOS.mm',
-          '../src/views/mac/SkEventNotifier.h',
           '../src/views/mac/SkEventNotifier.mm',
-          '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.h',
           '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm',
-          '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h',
           '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm',
-          '../experimental/iOSSampleApp/Shared/SkUIView.h',
           '../experimental/iOSSampleApp/Shared/SkUIView.mm',
           '../experimental/iOSSampleApp/Shared/skia_ios.mm',
-          '../experimental/SimpleiOSApp/SimpleApp.h',
           '../experimental/SimpleiOSApp/SimpleApp.mm',
         ],
         'dependencies': [