[Chromium] Remove javascript_engine from WebCore.gyp
authormihaip@chromium.org <mihaip@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Sep 2011 18:25:26 +0000 (18:25 +0000)
committermihaip@chromium.org <mihaip@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Sep 2011 18:25:26 +0000 (18:25 +0000)
https://bugs.webkit.org/show_bug.cgi?id=68001

Reviewed by Tony Chang.

Remove javascript_engine GYP variable (similar to the removal done on
the Chromium side with http://crrev.com/100692)

* WebCore.gyp/WebCore.gyp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@95035 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.gyp/WebCore.gyp

index f574358..7f7fbe9 100644 (file)
@@ -1,3 +1,15 @@
+2011-09-13  Mihai Parparita  <mihaip@chromium.org>
+
+        [Chromium] Remove javascript_engine from WebCore.gyp
+        https://bugs.webkit.org/show_bug.cgi?id=68001
+
+        Reviewed by Tony Chang.
+
+        Remove javascript_engine GYP variable (similar to the removal done on
+        the Chromium side with http://crrev.com/100692)
+
+        * WebCore.gyp/WebCore.gyp:
+
 2011-09-12  Ryosuke Niwa  <rniwa@webkit.org>
 
         [CSS3 Backgrounds and Borders] Add unprefixed border-image shorthand.
index 92434cf..40664f2 100644 (file)
     # binary and increasing the speed of gdb.
     'enable_svg%': 1,
 
-    # Use v8 as default JavaScript engine. This makes sure that javascript_engine variable
-    # is set for both inside_chromium_build 0 and 1 cases.
-    'javascript_engine%': 'v8',
-
     'webcore_include_dirs': [
       '../',
       '../..',
         '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp',
         '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
         '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
+        '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
         '<(libjpeg_gyp_path):libjpeg',
       ],
       'include_dirs': [
         '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendDispatcher.cpp',
       ],
       'conditions': [
-        ['javascript_engine=="v8"', {
-          'dependencies': [
-            '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
-          ],
-          'conditions': [
-            ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
-              'defines': [
-                'USING_V8_SHARED',
-              ],
-            }],
+        ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
+          'defines': [
+            'USING_V8_SHARED',
           ],
         }],
         # TODO(maruel): Move it in its own project or generate it anyway?
         '<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
         '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_common',
+        '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
         '<(libjpeg_gyp_path):libjpeg',
       ],
       'export_dependent_settings': [
         '<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
         '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_common',
+        '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
         '<(libjpeg_gyp_path):libjpeg',
       ],
       # This is needed for mac because of webkit_system_interface. It'd be nice
         },
       },
       'conditions': [
-        ['javascript_engine=="v8"', {
-          'dependencies': [
-            '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
-          ],
-          'export_dependent_settings': [
-            '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
-          ],
-          'conditions': [
-            ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
-              'direct_dependent_settings': {
-                'defines': [
-                  'USING_V8_SHARED',
-                ],
-              },
-            }],
-          ],
+        ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
+          'direct_dependent_settings': {
+            'defines': [
+               'USING_V8_SHARED',
+            ],
+          },
         }],
         ['use_accelerated_compositing==1', {
           'dependencies': [
       'type': 'static_library',
       'dependencies': [
         'webcore_prerequisites',
+        '<(chromium_src_dir)/third_party/v8-i18n/build/all.gyp:v8-i18n',
       ],
       # This is needed for mac because of webkit_system_interface. It'd be nice
       # if this hard dependency could be split off the rest.
             ['exclude', '/(Windows|Uniscribe)[^/]*\\.cpp$']
           ],
         }],
-        ['javascript_engine=="v8"', {
-          'dependencies': [
-            '<(chromium_src_dir)/third_party/v8-i18n/build/all.gyp:v8-i18n',
-          ],
-        }],
       ],
     },
     {
         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(chromium_src_dir)/skia/skia.gyp:skia',
         '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
+        '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
       ],
       'export_dependent_settings': [
         'webcore_bindings',
         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(chromium_src_dir)/skia/skia.gyp:skia',
         '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
+        '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
         ],
       },
       'conditions': [
-        ['javascript_engine=="v8"', {
-          'dependencies': [
-            '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
-          ],
-          'export_dependent_settings': [
-            '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
-          ],
-        }],
         ['OS=="mac"', {
           'direct_dependent_settings': {
             'include_dirs': [