diff options
| author | yusufo@chromium.org <yusufo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-22 01:21:32 +0000 |
|---|---|---|
| committer | yusufo@chromium.org <yusufo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-22 01:21:32 +0000 |
| commit | 7ebed72c88826819cdd70556ec1e8b12a9bc5b1d (patch) | |
| tree | bf04c7043a808c1060cb163d17adb92209d8249b /build/java.gypi | |
| parent | 9044da61083433b53cace2554f3c7e2230c683c9 (diff) | |
| download | chromium_src-7ebed72c88826819cdd70556ec1e8b12a9bc5b1d.zip chromium_src-7ebed72c88826819cdd70556ec1e8b12a9bc5b1d.tar.gz chromium_src-7ebed72c88826819cdd70556ec1e8b12a9bc5b1d.tar.bz2 | |
Revert "Revert 158067 - Remove native side of content_view_client"
The previous CL broke the build, because the changes in net_errors_java.template
didn't get the net_error_java target to be rebuilt. We needed a net.gyp change
that makes sure NetError.java gets recreated after the changes.
BUG=137967
TBR=jam@chromium.org, mkosiba@chromium.org, willchan@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10963041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158146 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/java.gypi')
| -rw-r--r-- | build/java.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build/java.gypi b/build/java.gypi index ccc4f8c..249f063 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -39,6 +39,7 @@ 'variables': { 'input_jars_paths': [], 'additional_src_dirs': [], + 'additional_input_paths': [], }, 'actions': [ { @@ -49,6 +50,7 @@ 'android/ant/chromium-jars.xml', '<!@(find <(java_in_dir) -name "*.java")', '>@(input_jars_paths)', + '>@(additional_input_paths)', ], 'outputs': [ '<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar', |