[Chromium] ImageDiff should be build for host on Android
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 May 2012 18:26:41 +0000 (18:26 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 May 2012 18:26:41 +0000 (18:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=82039

Patch by Wei James <james.wei@intel.com> on 2012-05-14
Reviewed by Adam Barth.

Source/WTF:

* WTF.gyp/WTF.gyp:

Tools:

* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:

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

Source/WTF/ChangeLog
Source/WTF/WTF.gyp/WTF.gyp
Tools/ChangeLog
Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp

index 4fc6d22..7e4c26f 100644 (file)
@@ -1,3 +1,12 @@
+2012-05-14  Wei James  <james.wei@intel.com>
+
+        [Chromium] ImageDiff should be build for host on Android
+        https://bugs.webkit.org/show_bug.cgi?id=82039
+
+        Reviewed by Adam Barth.
+
+        * WTF.gyp/WTF.gyp:
+
 2012-05-14  Yong Li  <yoli@rim.com>
 
         DFG JIT is not ARM EABI compatible
index 6767df6..a1705ba 100644 (file)
             ],
           }],
         ],
-      }
+      },
+      'conditions': [
+        ['OS=="android" and android_build_type==0', {
+          # Android builds ImageDiff for host, which has a dependency on wtf.
+          # That means we need to build this target for both host and target.
+          'toolsets': ['host', 'target'],
+        }],
+      ]
     },
     {
       'target_name': 'wtf',
             }],
           ],
         }],
+        ['OS=="android" and android_build_type==0', {
+          # Android builds ImageDiff for host, which has a dependency on wtf.
+          # That means we need to build this target for both host and target.
+          'toolsets': ['host', 'target'],
+        }],
       ],
     },
   ]
index aa1663d..bd19607 100644 (file)
@@ -1,3 +1,12 @@
+2012-05-14  Wei James  <james.wei@intel.com>
+
+        [Chromium] ImageDiff should be build for host on Android
+        https://bugs.webkit.org/show_bug.cgi?id=82039
+
+        Reviewed by Adam Barth.
+
+        * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+
 2012-05-14  Joone Hur  <joone@webkit.org>
 
         Unreviewed. Updating email for committers.py script.
index 520e389..6d68c04 100644 (file)
@@ -67,9 +67,9 @@
             ],
             'conditions': [
                 ['OS=="android"', {
-                    # FIXME: Re-enable building ImageDiff after the dependencies
-                    # for host have been fixed, as this broke per the WTF move.
-                    'type': 'none',
+                    # The Chromium Android port will compare images on host rather
+                    # than target (a device or emulator) for performance reasons.
+                    'toolsets': ['host'],
                 }],
             ],
         },
                 }],
                 ['OS=="android"', {
                     'dependencies': [
-                        # FIXME: Re-enable building ImageDiff on Android.
-                        # https://bugs.webkit.org/show_bug.cgi?id=82039
-                        #'ImageDiff#host',
+                        'ImageDiff#host',
                     ],
                     'sources/': [
                         ['include', 'chromium/TestShellLinux\\.cpp$'],