summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorcjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-13 01:44:03 +0000
committercjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-13 01:44:03 +0000
commit2bd16e7105e0c764d2c23f29d7cad9e8e6ac5ee4 (patch)
tree25309b5619d7d4fc18dd13732d3e85d38f0994c1 /base
parentea4ff80049f9f4e6e2465b8885637e3467b282da (diff)
downloadchromium_src-2bd16e7105e0c764d2c23f29d7cad9e8e6ac5ee4.zip
chromium_src-2bd16e7105e0c764d2c23f29d7cad9e8e6ac5ee4.tar.gz
chromium_src-2bd16e7105e0c764d2c23f29d7cad9e8e6ac5ee4.tar.bz2
Fix Android ninja sdk build
For some reason, the way we build jars needs us to specify java_in_dir this way with ninja. BUG= Review URL: https://chromiumcodereview.appspot.com/10908223 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156457 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/base.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 0b45fdb..b63f7b1 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -963,7 +963,7 @@
'type': 'none',
'variables': {
'package_name': 'base',
- 'java_in_dir': 'android/java',
+ 'java_in_dir': '../base/android/java',
},
'includes': [ '../build/java.gypi' ],
},
@@ -975,7 +975,7 @@
],
'variables': {
'package_name': 'base_javatests',
- 'java_in_dir': 'android/javatests',
+ 'java_in_dir': '../base/android/javatests',
},
'includes': [ '../build/java.gypi' ],
},