Changeset 145714 in webkit

Timestamp:

Mar 13, 2013 7:13:13 AM (11 years ago)

Author:

mnaganov@chromium.org

Message:

[Chromium] Rename android_build_type to android_webview_build in .gyp files.
​https://bugs.webkit.org/show_bug.cgi?id=112129

Reviewed by Adam Barth.

Following Chromium
​http://src.chromium.org/viewvc/chrome?view=rev&revision=187556
this is being renamed to better explain what it does.

Source/WebKit/chromium:

• WebKitUnitTests.gyp:

Tools:

• DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:

Location:

trunk

Files:

• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/WebKitUnitTests.gyp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-03-13  Mikhail Naganov  <mnaganov@chromium.org>
+
+        [Chromium] Rename android_build_type to android_webview_build in .gyp files.
+        https://bugs.webkit.org/show_bug.cgi?id=112129
+
+        Reviewed by Adam Barth.
+
+        Following Chromium
+        http://src.chromium.org/viewvc/chrome?view=rev&revision=187556
+        this is being renamed to better explain what it does.
+
+        * WebKitUnitTests.gyp:
+
 2013-03-13  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebKit/chromium/WebKitUnitTests.gyp

@@ -145 +145 @@
             },
         }],
-        ['OS=="android" and android_build_type==0 and gtest_target_type == "shared_library"', {
+        ['OS=="android" and android_webview_build==0 and gtest_target_type == "shared_library"', {
             # Wrap libwebkit_unit_tests.so into an android apk for execution.
             'targets': [{

trunk/Tools/ChangeLog

@@ +1 @@
+2013-03-13  Mikhail Naganov  <mnaganov@chromium.org>
+
+        [Chromium] Rename android_build_type to android_webview_build in .gyp files.
+        https://bugs.webkit.org/show_bug.cgi?id=112129
+
+        Reviewed by Adam Barth.
+
+        Following Chromium
+        http://src.chromium.org/viewvc/chrome?view=rev&revision=187556
+        this is being renamed to better explain what it does.
+
+        * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+
 2013-03-13  Simon Hausmann  <simon.hausmann@digia.com>
 

trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp

@@ -70 +70 @@
             ],
             'conditions': [
-                ['OS=="android" and android_build_type==0', {
+                ['OS=="android" and android_webview_build==0', {
                     # The Chromium Android port will compare images on host rather
                     # than target (a device or emulator) for performance reasons.
                     'toolsets': ['host'],
                 }],
-                ['OS=="android" and android_build_type!=0', {
+                ['OS=="android" and android_webview_build==1', {
                     'type': 'none',
                 }],
@@ -220 +220 @@
                     }],
                 }],
-                ['OS=="android" and android_build_type==0', {
+                ['OS=="android" and android_webview_build==0', {
                     'dependencies': [
                         'ImageDiff#host',