Make cc_unittests and webkit_compositor_unittests executable always

To get these tests set up to run on the bots they need to be executables always.
If use_libcc_for_compositor is 0 these targets won't run any tests, but they will
still successfully run.

TBR=joth@chromium.org (for stupid android_webview copyright script)
BUG=

Review URL: https://chromiumcodereview.appspot.com/10920056

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154620 0039d316-1c4b-4281-b951-d872f2087c98

56 files changed, 35 insertions, 28 deletions

diff --git a/webkit/compositor/CCThreadImpl.cpp b/webkit/compositor_bindings/CCThreadImpl.cpp
index 18db0ad..18db0ad 100644
--- a/webkit/compositor/CCThreadImpl.cpp
+++ b/webkit/compositor_bindings/CCThreadImpl.cpp
diff --git a/webkit/compositor/CCThreadImpl.h b/webkit/compositor_bindings/CCThreadImpl.h
index 094d5b5..094d5b5 100644
--- a/webkit/compositor/CCThreadImpl.h
+++ b/webkit/compositor_bindings/CCThreadImpl.h
diff --git a/webkit/compositor/LayerChromiumTest.cpp b/webkit/compositor_bindings/LayerChromiumTest.cpp
index 4838f84..4838f84 100644
--- a/webkit/compositor/LayerChromiumTest.cpp
+++ b/webkit/compositor_bindings/LayerChromiumTest.cpp
diff --git a/webkit/compositor/PlatformGestureCurve.h b/webkit/compositor_bindings/PlatformGestureCurve.h
index 5669742..5669742 100644
--- a/webkit/compositor/PlatformGestureCurve.h
+++ b/webkit/compositor_bindings/PlatformGestureCurve.h
diff --git a/webkit/compositor/PlatformGestureCurveTarget.h b/webkit/compositor_bindings/PlatformGestureCurveTarget.h
index 41e96d6..41e96d6 100644
--- a/webkit/compositor/PlatformGestureCurveTarget.h
+++ b/webkit/compositor_bindings/PlatformGestureCurveTarget.h
diff --git a/webkit/compositor/TextureCopierTest.cpp b/webkit/compositor_bindings/TextureCopierTest.cpp
index c2382d2..c2382d2 100644
--- a/webkit/compositor/TextureCopierTest.cpp
+++ b/webkit/compositor_bindings/TextureCopierTest.cpp
diff --git a/webkit/compositor/TextureLayerChromiumTest.cpp b/webkit/compositor_bindings/TextureLayerChromiumTest.cpp
index b038ac0..b038ac0 100644
--- a/webkit/compositor/TextureLayerChromiumTest.cpp
+++ b/webkit/compositor_bindings/TextureLayerChromiumTest.cpp
diff --git a/webkit/compositor/ThrottledTextureUploaderTest.cpp b/webkit/compositor_bindings/ThrottledTextureUploaderTest.cpp
index 86b7a10..86b7a10 100644
--- a/webkit/compositor/ThrottledTextureUploaderTest.cpp
+++ b/webkit/compositor_bindings/ThrottledTextureUploaderTest.cpp
diff --git a/webkit/compositor/TiledLayerChromiumTest.cpp b/webkit/compositor_bindings/TiledLayerChromiumTest.cpp
index 029a8a7..029a8a7 100644
--- a/webkit/compositor/TiledLayerChromiumTest.cpp
+++ b/webkit/compositor_bindings/TiledLayerChromiumTest.cpp
diff --git a/webkit/compositor/TouchpadFlingPlatformGestureCurve.h b/webkit/compositor_bindings/TouchpadFlingPlatformGestureCurve.h
index 072e914..072e914 100644
--- a/webkit/compositor/TouchpadFlingPlatformGestureCurve.h
+++ b/webkit/compositor_bindings/TouchpadFlingPlatformGestureCurve.h
diff --git a/webkit/compositor/TreeSynchronizerTest.cpp b/webkit/compositor_bindings/TreeSynchronizerTest.cpp
index 6268543..6268543 100644
--- a/webkit/compositor/TreeSynchronizerTest.cpp
+++ b/webkit/compositor_bindings/TreeSynchronizerTest.cpp
diff --git a/webkit/compositor/WebAnimationCurveCommon.cpp b/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
index 2e45dc5..2e45dc5 100644
--- a/webkit/compositor/WebAnimationCurveCommon.cpp
+++ b/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
diff --git a/webkit/compositor/WebAnimationCurveCommon.h b/webkit/compositor_bindings/WebAnimationCurveCommon.h
index b911e82..b911e82 100644
--- a/webkit/compositor/WebAnimationCurveCommon.h
+++ b/webkit/compositor_bindings/WebAnimationCurveCommon.h
diff --git a/webkit/compositor/WebAnimationImpl.cpp b/webkit/compositor_bindings/WebAnimationImpl.cpp
index bbae89b..bbae89b 100644
--- a/webkit/compositor/WebAnimationImpl.cpp
+++ b/webkit/compositor_bindings/WebAnimationImpl.cpp
diff --git a/webkit/compositor/WebAnimationImpl.h b/webkit/compositor_bindings/WebAnimationImpl.h
index e549650..e549650 100644
--- a/webkit/compositor/WebAnimationImpl.h
+++ b/webkit/compositor_bindings/WebAnimationImpl.h
diff --git a/webkit/compositor/WebAnimationTest.cpp b/webkit/compositor_bindings/WebAnimationTest.cpp
index cb9be37..cb9be37 100644
--- a/webkit/compositor/WebAnimationTest.cpp
+++ b/webkit/compositor_bindings/WebAnimationTest.cpp
diff --git a/webkit/compositor/WebCompositorImpl.cpp b/webkit/compositor_bindings/WebCompositorImpl.cpp
index 530fa9b..530fa9b 100644
--- a/webkit/compositor/WebCompositorImpl.cpp
+++ b/webkit/compositor_bindings/WebCompositorImpl.cpp
diff --git a/webkit/compositor/WebCompositorImpl.h b/webkit/compositor_bindings/WebCompositorImpl.h
index 8c386bc..8c386bc 100644
--- a/webkit/compositor/WebCompositorImpl.h
+++ b/webkit/compositor_bindings/WebCompositorImpl.h
diff --git a/webkit/compositor/WebCompositorInputHandlerImpl.cpp b/webkit/compositor_bindings/WebCompositorInputHandlerImpl.cpp
index 20c1e96c..20c1e96c 100644
--- a/webkit/compositor/WebCompositorInputHandlerImpl.cpp
+++ b/webkit/compositor_bindings/WebCompositorInputHandlerImpl.cpp
diff --git a/webkit/compositor/WebCompositorInputHandlerImpl.h b/webkit/compositor_bindings/WebCompositorInputHandlerImpl.h
index 6f1c3e1..6f1c3e1 100644
--- a/webkit/compositor/WebCompositorInputHandlerImpl.h
+++ b/webkit/compositor_bindings/WebCompositorInputHandlerImpl.h
diff --git a/webkit/compositor/WebContentLayerImpl.cpp b/webkit/compositor_bindings/WebContentLayerImpl.cpp
index 05775a3..05775a3 100644
--- a/webkit/compositor/WebContentLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebContentLayerImpl.cpp
diff --git a/webkit/compositor/WebContentLayerImpl.h b/webkit/compositor_bindings/WebContentLayerImpl.h
index f11a0f3..f11a0f3 100644
--- a/webkit/compositor/WebContentLayerImpl.h
+++ b/webkit/compositor_bindings/WebContentLayerImpl.h
diff --git a/webkit/compositor/WebExternalTextureLayerImpl.cpp b/webkit/compositor_bindings/WebExternalTextureLayerImpl.cpp
index 0537fc2..0537fc2 100644
--- a/webkit/compositor/WebExternalTextureLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebExternalTextureLayerImpl.cpp
diff --git a/webkit/compositor/WebExternalTextureLayerImpl.h b/webkit/compositor_bindings/WebExternalTextureLayerImpl.h
index e7e96ec..e7e96ec 100644
--- a/webkit/compositor/WebExternalTextureLayerImpl.h
+++ b/webkit/compositor_bindings/WebExternalTextureLayerImpl.h
diff --git a/webkit/compositor/WebFloatAnimationCurveImpl.cpp b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp
index cc1ad35..cc1ad35 100644
--- a/webkit/compositor/WebFloatAnimationCurveImpl.cpp
+++ b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp
diff --git a/webkit/compositor/WebFloatAnimationCurveImpl.h b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.h
index 04c3c9a..04c3c9a 100644
--- a/webkit/compositor/WebFloatAnimationCurveImpl.h
+++ b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.h
diff --git a/webkit/compositor/WebFloatAnimationCurveTest.cpp b/webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp
index b587e09..b587e09 100644
--- a/webkit/compositor/WebFloatAnimationCurveTest.cpp
+++ b/webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp
diff --git a/webkit/compositor/WebIOSurfaceLayerImpl.cpp b/webkit/compositor_bindings/WebIOSurfaceLayerImpl.cpp
index 251f06a..251f06a 100644
--- a/webkit/compositor/WebIOSurfaceLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebIOSurfaceLayerImpl.cpp
diff --git a/webkit/compositor/WebIOSurfaceLayerImpl.h b/webkit/compositor_bindings/WebIOSurfaceLayerImpl.h
index d2d3a87..d2d3a87 100644
--- a/webkit/compositor/WebIOSurfaceLayerImpl.h
+++ b/webkit/compositor_bindings/WebIOSurfaceLayerImpl.h
diff --git a/webkit/compositor/WebImageLayerImpl.cpp b/webkit/compositor_bindings/WebImageLayerImpl.cpp
index bb1b56b..bb1b56b 100644
--- a/webkit/compositor/WebImageLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebImageLayerImpl.cpp
diff --git a/webkit/compositor/WebImageLayerImpl.h b/webkit/compositor_bindings/WebImageLayerImpl.h
index 242edf4..242edf4 100644
--- a/webkit/compositor/WebImageLayerImpl.h
+++ b/webkit/compositor_bindings/WebImageLayerImpl.h
diff --git a/webkit/compositor/WebLayerImpl.cpp b/webkit/compositor_bindings/WebLayerImpl.cpp
index 4b25479..4b25479 100644
--- a/webkit/compositor/WebLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebLayerImpl.cpp
diff --git a/webkit/compositor/WebLayerImpl.h b/webkit/compositor_bindings/WebLayerImpl.h
index 71f83db..71f83db 100644
--- a/webkit/compositor/WebLayerImpl.h
+++ b/webkit/compositor_bindings/WebLayerImpl.h
diff --git a/webkit/compositor/WebLayerTest.cpp b/webkit/compositor_bindings/WebLayerTest.cpp
index 18dc044..18dc044 100644
--- a/webkit/compositor/WebLayerTest.cpp
+++ b/webkit/compositor_bindings/WebLayerTest.cpp
diff --git a/webkit/compositor/WebLayerTreeViewImpl.cpp b/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
index 7bfcff1..7bfcff1 100644
--- a/webkit/compositor/WebLayerTreeViewImpl.cpp
+++ b/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
diff --git a/webkit/compositor/WebLayerTreeViewImpl.h b/webkit/compositor_bindings/WebLayerTreeViewImpl.h
index bccd1c0..bccd1c0 100644
--- a/webkit/compositor/WebLayerTreeViewImpl.h
+++ b/webkit/compositor_bindings/WebLayerTreeViewImpl.h
diff --git a/webkit/compositor/WebLayerTreeViewTest.cpp b/webkit/compositor_bindings/WebLayerTreeViewTest.cpp
index d09b8067..d09b8067 100644
--- a/webkit/compositor/WebLayerTreeViewTest.cpp
+++ b/webkit/compositor_bindings/WebLayerTreeViewTest.cpp
diff --git a/webkit/compositor/WebScrollbarLayerImpl.cpp b/webkit/compositor_bindings/WebScrollbarLayerImpl.cpp
index 6aa6978..6aa6978 100644
--- a/webkit/compositor/WebScrollbarLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebScrollbarLayerImpl.cpp
diff --git a/webkit/compositor/WebScrollbarLayerImpl.h b/webkit/compositor_bindings/WebScrollbarLayerImpl.h
index d4a33a1..d4a33a1 100644
--- a/webkit/compositor/WebScrollbarLayerImpl.h
+++ b/webkit/compositor_bindings/WebScrollbarLayerImpl.h
diff --git a/webkit/compositor/WebSolidColorLayerImpl.cpp b/webkit/compositor_bindings/WebSolidColorLayerImpl.cpp
index ff4cf4e..ff4cf4e 100644
--- a/webkit/compositor/WebSolidColorLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebSolidColorLayerImpl.cpp
diff --git a/webkit/compositor/WebSolidColorLayerImpl.h b/webkit/compositor_bindings/WebSolidColorLayerImpl.h
index db15d19..db15d19 100644
--- a/webkit/compositor/WebSolidColorLayerImpl.h
+++ b/webkit/compositor_bindings/WebSolidColorLayerImpl.h
diff --git a/webkit/compositor/WebTransformAnimationCurveImpl.cpp b/webkit/compositor_bindings/WebTransformAnimationCurveImpl.cpp
index 2cdf000..2cdf000 100644
--- a/webkit/compositor/WebTransformAnimationCurveImpl.cpp
+++ b/webkit/compositor_bindings/WebTransformAnimationCurveImpl.cpp
diff --git a/webkit/compositor/WebTransformAnimationCurveImpl.h b/webkit/compositor_bindings/WebTransformAnimationCurveImpl.h
index b7d7018..b7d7018 100644
--- a/webkit/compositor/WebTransformAnimationCurveImpl.h
+++ b/webkit/compositor_bindings/WebTransformAnimationCurveImpl.h
diff --git a/webkit/compositor/WebTransformAnimationCurveTest.cpp b/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp
index ee86d61..ee86d61 100644
--- a/webkit/compositor/WebTransformAnimationCurveTest.cpp
+++ b/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp
diff --git a/webkit/compositor/WebTransformOperationsTest.cpp b/webkit/compositor_bindings/WebTransformOperationsTest.cpp
index efc0003..efc0003 100644
--- a/webkit/compositor/WebTransformOperationsTest.cpp
+++ b/webkit/compositor_bindings/WebTransformOperationsTest.cpp
diff --git a/webkit/compositor/WebTransformationMatrixTest.cpp b/webkit/compositor_bindings/WebTransformationMatrixTest.cpp
index f0b09fc..f0b09fc 100644
--- a/webkit/compositor/WebTransformationMatrixTest.cpp
+++ b/webkit/compositor_bindings/WebTransformationMatrixTest.cpp
diff --git a/webkit/compositor/WebVideoLayerImpl.cpp b/webkit/compositor_bindings/WebVideoLayerImpl.cpp
index b1f6751..b1f6751 100644
--- a/webkit/compositor/WebVideoLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebVideoLayerImpl.cpp
diff --git a/webkit/compositor/WebVideoLayerImpl.h b/webkit/compositor_bindings/WebVideoLayerImpl.h
index b9e9d7f..b9e9d7f 100644
--- a/webkit/compositor/WebVideoLayerImpl.h
+++ b/webkit/compositor_bindings/WebVideoLayerImpl.h
diff --git a/webkit/compositor/WheelFlingPlatformGestureCurve.h b/webkit/compositor_bindings/WheelFlingPlatformGestureCurve.h
index 2ff1f46..2ff1f46 100644
--- a/webkit/compositor/WheelFlingPlatformGestureCurve.h
+++ b/webkit/compositor_bindings/WheelFlingPlatformGestureCurve.h
diff --git a/webkit/compositor/compositor.gyp b/webkit/compositor_bindings/compositor_bindings.gyp
index 3f71c1f..5536de0 100644
--- a/webkit/compositor/compositor.gyp
+++ b/webkit/compositor_bindings/compositor_bindings.gyp
@@ -6,7 +6,7 @@
   'variables': {
     'chromium_code': 0,
     'use_libcc_for_compositor%': 0,
-    'webkit_compositor_sources': [
+    'webkit_compositor_bindings_sources': [
       'CCThreadImpl.cpp',
       'CCThreadImpl.h',
       'PlatformGestureCurve.h',
@@ -49,7 +49,7 @@
     ['use_libcc_for_compositor==1', {
       'targets': [
         {
-          'target_name': 'webkit_compositor',
+          'target_name': 'webkit_compositor_bindings',
           'type': 'static_library',
           'dependencies': [
             '../../base/base.gyp:base',
@@ -69,7 +69,7 @@
             '../../third_party/WebKit/Source/WebKit/chromium/public',
           ],
           'sources': [
-            '<@(webkit_compositor_sources)',
+            '<@(webkit_compositor_bindings_sources)',
             'stubs/AnimationIdVendor.h',
             'stubs/public/WebTransformationMatrix',
           ],
diff --git a/webkit/compositor/compositor_tests.gyp b/webkit/compositor_bindings/compositor_bindings_tests.gyp
index 87ecd48..00fbb30 100644
--- a/webkit/compositor/compositor_tests.gyp
+++ b/webkit/compositor_bindings/compositor_bindings_tests.gyp
@@ -6,7 +6,7 @@
   'variables': {
     'chromium_code': 0,
     'use_libcc_for_compositor%': 0,
-    'webkit_compositor_tests_sources': [
+    'webkit_compositor_bindings_tests_sources': [
       'LayerChromiumTest.cpp',
       'TextureCopierTest.cpp',
       'TextureLayerChromiumTest.cpp',
@@ -26,23 +26,31 @@
       'test/WebLayerTreeViewTestCommon.h',
     ],
   },
-  'conditions': [
-    ['use_libcc_for_compositor==1 and component!="shared_library"', {
-      'targets': [
-        {
-          'target_name': 'webkit_compositor_unittests',
-          'type' : 'executable',
+  'targets': [
+    {
+      'target_name': 'webkit_compositor_bindings_unittests',
+      'type' : 'executable',
+      'dependencies': [
+        '../../base/base.gyp:test_support_base',
+        '../../testing/gmock.gyp:gmock',
+        '../../testing/gtest.gyp:gtest',
+      ],
+      'sources': [
+        'test/run_all_unittests.cc',
+      ],
+      'conditions': [
+        ['use_libcc_for_compositor==1 and component!="shared_library"', {
+          'defines': [
+            'USE_LIBCC_FOR_COMPOSITOR',
+          ],
           'dependencies': [
-            '../../base/base.gyp:test_support_base',
             '../../cc/cc.gyp:cc',
             '../../cc/cc_tests.gyp:cc_test_support',
             '../../skia/skia.gyp:skia',
-            '../../testing/gmock.gyp:gmock',
-            '../../testing/gtest.gyp:gtest',
             '../../third_party/WebKit/Source/Platform/Platform.gyp/Platform.gyp:webkit_platform',
             '../../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
             '../../webkit/support/webkit_support.gyp:webkit_support',
-            'compositor.gyp:webkit_compositor',
+            'compositor_bindings.gyp:webkit_compositor_bindings',
           ],
           'include_dirs': [
             '.',
@@ -52,18 +60,10 @@
             '<(DEPTH)/cc/test',
           ],
           'sources': [
-            '<@(webkit_compositor_tests_sources)',
-            'test/run_all_unittests.cc',
+            '<@(webkit_compositor_bindings_tests_sources)',
           ]
-        },
-      ],
-    }, {
-      'targets': [
-        {
-          'target_name': 'webkit_compositor_unittests',
-          'type' : 'none',
-        }
+        }],
       ],
-    }],
+    },
   ],
 }
diff --git a/webkit/compositor/copyfiles.py b/webkit/compositor_bindings/copyfiles.py
index f11ff6d..3d8a4db 100644
--- a/webkit/compositor/copyfiles.py
+++ b/webkit/compositor_bindings/copyfiles.py
@@ -61,13 +61,13 @@ def FixCopyrightHeader(filepath):
     f.write(fixed_text)
 
 def Main():
-  files = Readfile("compositor.gyp")['variables']['webkit_compositor_sources']
+  files = Readfile("compositor_bindings.gyp")['variables']['webkit_compositor_bindings_sources']
   for f in files:
     dst = Copy(f)
     FixCopyrightHeader(dst)
 
-  variables = Readfile("compositor_tests.gyp")['variables']
-  files = variables['webkit_compositor_tests_sources']
+  variables = Readfile("compositor_bindings_tests.gyp")['variables']
+  files = variables['webkit_compositor_bindings_tests_sources']
   for f in files:
     dst = Copy(f)
     FixCopyrightHeader(dst)
diff --git a/webkit/compositor/stubs/public/WebTransformationMatrix.h b/webkit/compositor_bindings/stubs/public/WebTransformationMatrix.h
index 2c6ed7c..2c6ed7c 100644
--- a/webkit/compositor/stubs/public/WebTransformationMatrix.h
+++ b/webkit/compositor_bindings/stubs/public/WebTransformationMatrix.h
diff --git a/webkit/compositor/test/FakeWebScrollbarThemeGeometry.h b/webkit/compositor_bindings/test/FakeWebScrollbarThemeGeometry.h
index 640da26..640da26 100644
--- a/webkit/compositor/test/FakeWebScrollbarThemeGeometry.h
+++ b/webkit/compositor_bindings/test/FakeWebScrollbarThemeGeometry.h
diff --git a/webkit/compositor/test/WebLayerTreeViewTestCommon.h b/webkit/compositor_bindings/test/WebLayerTreeViewTestCommon.h
index 2a81fb9..2a81fb9 100644
--- a/webkit/compositor/test/WebLayerTreeViewTestCommon.h
+++ b/webkit/compositor_bindings/test/WebLayerTreeViewTestCommon.h
diff --git a/webkit/compositor/test/run_all_unittests.cc b/webkit/compositor_bindings/test/run_all_unittests.cc
index de5b1c6..d6c4ba0 100644
--- a/webkit/compositor/test/run_all_unittests.cc
+++ b/webkit/compositor_bindings/test/run_all_unittests.cc
@@ -4,14 +4,21 @@
 
 #include <base/test/test_suite.h>
 #include <gmock/gmock.h>
+
+#if defined(USE_LIBCC_FOR_COMPOSITOR)
 #include <webkit/support/webkit_support.h>
+#endif
 
 int main(int argc, char** argv) {
   ::testing::InitGoogleMock(&argc, argv);
   TestSuite testSuite(argc, argv);
+#if defined(USE_LIBCC_FOR_COMPOSITOR)
   webkit_support::SetUpTestEnvironmentForUnitTests();
+#endif
   int result = testSuite.Run();
+#if defined(USE_LIBCC_FOR_COMPOSITOR)
   webkit_support::TearDownTestEnvironment();
+#endif
 
   return result;
 }