summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authornileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-11 03:23:47 +0000
committernileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-11 03:23:47 +0000
commit280e9b5d4b2fb0fe14824e526521710a658bce56 (patch)
treeff305a8ca0c6647a467c854e939e0fd98db986f7 /ipc
parenta7aa47d5f7c39378db55c6af18d1ea7c791886eb (diff)
downloadchromium_src-280e9b5d4b2fb0fe14824e526521710a658bce56.zip
chromium_src-280e9b5d4b2fb0fe14824e526521710a658bce56.tar.gz
chromium_src-280e9b5d4b2fb0fe14824e526521710a658bce56.tar.bz2
Fix chromium_base.jar path for APK builds.
Also, Don't make try_compile_test bot RED if native tests APK fails to compile. BUG=125059 TBR=mark@chromium.org,tsepez@chromium.org TEST= Review URL: https://chromiumcodereview.appspot.com/10310098 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
-rw-r--r--ipc/ipc.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index e6b5116..7b137f0 100644
--- a/ipc/ipc.gyp
+++ b/ipc/ipc.gyp
@@ -112,7 +112,7 @@
'inputs': [
'../testing/android/generate_native_test.py',
'<(PRODUCT_DIR)/lib.target/libipc_tests.so',
- '<(PRODUCT_DIR)/chromium_base.jar'
+ '<(PRODUCT_DIR)/lib.java/chromium_base.jar'
],
'outputs': [
'<(PRODUCT_DIR)/ChromeNativeTests_ipc_tests-debug.apk',
@@ -124,7 +124,7 @@
# TODO(jrg): find a better way to specify jar
# dependencies. Hard coding seems fragile.
'--jar',
- '<(PRODUCT_DIR)/chromium_base.jar',
+ '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
'--output',
'<(PRODUCT_DIR)/ipc_tests_apk',
'--ant-args',