diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 03:23:47 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 03:23:47 +0000 |
| commit | 280e9b5d4b2fb0fe14824e526521710a658bce56 (patch) | |
| tree | ff305a8ca0c6647a467c854e939e0fd98db986f7 | |
| parent | a7aa47d5f7c39378db55c6af18d1ea7c791886eb (diff) | |
| download | chromium_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
| -rw-r--r-- | base/base.gyp | 4 | ||||
| -rwxr-xr-x | build/android/buildbot_functions.sh | 4 | ||||
| -rw-r--r-- | ipc/ipc.gyp | 4 | ||||
| -rw-r--r-- | ui/ui_unittests.gypi | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/base/base.gyp b/base/base.gyp index 8de65df..6f403fc 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -669,7 +669,7 @@ 'inputs': [ '../testing/android/generate_native_test.py', '<(PRODUCT_DIR)/lib.target/libbase_unittests.so', - '<(PRODUCT_DIR)/chromium_base.jar' + '<(PRODUCT_DIR)/lib.java/chromium_base.jar' ], 'outputs': [ '<(PRODUCT_DIR)/ChromeNativeTests_base_unittests-debug.apk', @@ -679,7 +679,7 @@ '--native_library', '<(PRODUCT_DIR)/lib.target/libbase_unittests.so', '--jar', - '<(PRODUCT_DIR)/chromium_base.jar', + '<(PRODUCT_DIR)/lib.java/chromium_base.jar', '--output', '<(PRODUCT_DIR)/base_unittests_apk', '--ant-args', diff --git a/build/android/buildbot_functions.sh b/build/android/buildbot_functions.sh index 20dba61..776076b 100755 --- a/build/android/buildbot_functions.sh +++ b/build/android/buildbot_functions.sh @@ -203,11 +203,11 @@ function bb_native_test_compile_run_tests { echo "@@@BUILD_STEP Native test runner template test@@@" tempfile=/tmp/tempfile-$$.txt build/android/run_tests.py --xvfb --verbose \ - -s out/Release/replaceme_apk/ChromeNativeTests-debug.apk \ + -s out/Release/replaceme_apk/replaceme-debug.apk \ | sed 's/@@@STEP_FAILURE@@@//g' | tee $tempfile happy_failure=$(cat $tempfile | grep RUNNER_FAILED | wc -l) if [[ $happy_failure -eq 0 ]] ; then - echo "@@@STEP_FAILURE@@@" + echo "@@@STEP_WARNINGS@@@" fi } 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', diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index d19cdfa..0f6d293 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -232,7 +232,7 @@ 'inputs': [ '../testing/android/generate_native_test.py', '<(PRODUCT_DIR)/lib.target/libui_unittests.so', - '<(PRODUCT_DIR)/chromium_base.jar', + '<(PRODUCT_DIR)/lib.java/chromium_base.jar', ], 'outputs': [ '<(PRODUCT_DIR)/ChromeNativeTests_ui_unittests-debug.apk', @@ -244,7 +244,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)/ui_unittests_apk', '--ant-args', |