Changeset 139963 in webkit

Timestamp:

Jan 16, 2013 9:16:27 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Fix build break for Android webview.
​https://bugs.webkit.org/show_bug.cgi?id=107072

Patch by Kristian Monsen <​kristianm@google.com> on 2013-01-16
Reviewed by Steve Block.

Add extra guards when checking for OS=="Android" to make sure it is not included
for webview.

• WebKitUnitTests.gyp:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKitUnitTests.gyp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-16  Kristian Monsen  <kristianm@google.com>
+
+        Fix build break for Android webview.
+        https://bugs.webkit.org/show_bug.cgi?id=107072
+
+        Reviewed by Steve Block.
+
+        Add extra guards when checking for OS=="Android" to make sure it is not included
+        for webview.
+
+        * WebKitUnitTests.gyp:
+
 2013-01-16  Dominic Cooney  <dominicc@chromium.org>
 

trunk/Source/WebKit/chromium/WebKitUnitTests.gyp

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