summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorpeter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 19:01:37 +0000
committerpeter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 19:01:37 +0000
commitbefeb5afd9055ae16f503f6ba855a22ca5231497 (patch)
tree801f0648b1f1f66abd31ef8a64c7bbca7edccac7 /build
parent3f079c736d61a33f801978c53ad89982ebc9b2d9 (diff)
downloadchromium_src-befeb5afd9055ae16f503f6ba855a22ca5231497.zip
chromium_src-befeb5afd9055ae16f503f6ba855a22ca5231497.tar.gz
chromium_src-befeb5afd9055ae16f503f6ba855a22ca5231497.tar.bz2
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
Diffstat (limited to 'build')
-rw-r--r--build/all_android.gyp1
1 files changed, 0 insertions, 1 deletions
diff --git a/build/all_android.gyp b/build/all_android.gyp
index ca3fe23..88d2791 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -50,7 +50,6 @@
'dependencies': [
'../webkit/webkit.gyp:pull_in_webkit_unit_tests',
'../webkit/webkit.gyp:pull_in_DumpRenderTree',
- '../base/android/java/java.gyp:base_java',
],
},
{