Commit befeb5af authored by peter@chromium.org's avatar peter@chromium.org

Build Java files as part of the base target for Android builds

Move the dependency to the base target, causing Java to be compiled on all
configurations (including trybots and the main waterfall bot). We currently
build two source files.

BUG=
TEST=Build output should execute the "base_java" action.

Review URL: http://codereview.chromium.org/9699018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126693 0039d316-1c4b-4281-b951-d872f2087c98
parent 3f079c73
...@@ -664,6 +664,7 @@ ...@@ -664,6 +664,7 @@
'dependencies': [ 'dependencies': [
'symbolize', 'symbolize',
'../third_party/ashmem/ashmem.gyp:ashmem', '../third_party/ashmem/ashmem.gyp:ashmem',
'android/java/java.gyp:base_java',
'base_jni_headers', 'base_jni_headers',
], ],
'include_dirs': [ 'include_dirs': [
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
'dependencies': [ 'dependencies': [
'../webkit/webkit.gyp:pull_in_webkit_unit_tests', '../webkit/webkit.gyp:pull_in_webkit_unit_tests',
'../webkit/webkit.gyp:pull_in_DumpRenderTree', '../webkit/webkit.gyp:pull_in_DumpRenderTree',
'../base/android/java/java.gyp:base_java',
], ],
}, },
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment