[chromium] Android apk targets should depend directly on Java library targets
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 11 Mar 2013 11:11:49 +0000 (11:11 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 11 Mar 2013 11:11:49 +0000 (11:11 +0000)
https://bugs.webkit.org/show_bug.cgi?id=111746

Patch by Chris Hopman <cjhopman@chromium.org> on 2013-03-11
Reviewed by Eric Seidel.

Source/WebKit/chromium:

* WebKitUnitTests.gyp:
Make webkit_unit_tests_apk depend directly on base_java and net_java.

Tools:

* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
Make DumpRenderTree_apk depend directly on base_java and net_java.
* TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp:
Make TestWebKitAPI_apk depend directly on base_java.

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

Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKitUnitTests.gyp
Tools/ChangeLog
Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp
Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp

index 047b8a1..7d2699c 100644 (file)
@@ -1,3 +1,13 @@
+2013-03-11  Chris Hopman  <cjhopman@chromium.org>
+
+        [chromium] Android apk targets should depend directly on Java library targets
+        https://bugs.webkit.org/show_bug.cgi?id=111746
+
+        Reviewed by Eric Seidel.
+
+        * WebKitUnitTests.gyp:
+        Make webkit_unit_tests_apk depend directly on base_java and net_java.
+
 2013-03-11  Jochen Eisinger  <jochen@chromium.org>
 
         [chromium] remove obsolete user gesture methods from WebFrame
index 84f5d41..4590d9e 100644 (file)
                 'target_name': 'webkit_unit_tests_apk',
                 'type': 'none',
                 'dependencies': [
-                    '<(chromium_src_dir)/base/base.gyp:base',
-                    '<(chromium_src_dir)/net/net.gyp:net',
+                    '<(chromium_src_dir)/base/base.gyp:base_java',
+                    '<(chromium_src_dir)/net/net.gyp:net_java',
                     'webkit_unit_tests',
                 ],
                 'variables': {
index d7eeaf7..240106e 100644 (file)
@@ -1,3 +1,15 @@
+2013-03-11  Chris Hopman  <cjhopman@chromium.org>
+
+        [chromium] Android apk targets should depend directly on Java library targets
+        https://bugs.webkit.org/show_bug.cgi?id=111746
+
+        Reviewed by Eric Seidel.
+
+        * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+        Make DumpRenderTree_apk depend directly on base_java and net_java.
+        * TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp:
+        Make TestWebKitAPI_apk depend directly on base_java.
+
 2013-03-11  Jochen Eisinger  <jochen@chromium.org>
 
         [chromium] remove obsolete user gesture methods from WebFrame
index 3bd66f1..2e65e1d 100644 (file)
                 'target_name': 'DumpRenderTree_apk',
                 'type': 'none',
                 'dependencies': [
-                    '<(chromium_src_dir)/base/base.gyp:base',
+                    '<(chromium_src_dir)/base/base.gyp:base_java',
                     '<(chromium_src_dir)/media/media.gyp:media_java',
-                    '<(chromium_src_dir)/net/net.gyp:net',
+                    '<(chromium_src_dir)/net/net.gyp:net_java',
                     'DumpRenderTree',
                 ],
                 'variables': {
index 4639a34..f2c5fa5 100644 (file)
                 'target_name': 'TestWebKitAPI_apk',
                 'type': 'none',
                 'dependencies': [
-                    '<(chromium_src_dir)/base/base.gyp:base',
+                    '<(chromium_src_dir)/base/base.gyp:base_java',
                     'TestWebKitAPI',
                 ],
                 'variables': {