summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authornileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-16 03:46:39 +0000
committernileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-16 03:46:39 +0000
commit5c5b0d4df9d301521787f988a7b3bedc4ba9f3c6 (patch)
tree981756e975ee455dfc8513a2b5360aea3817f277 /base/base.gyp
parent574acb04aaf6cfb8156ec3ba05e62a0e5033e993 (diff)
downloadchromium_src-5c5b0d4df9d301521787f988a7b3bedc4ba9f3c6.zip
chromium_src-5c5b0d4df9d301521787f988a7b3bedc4ba9f3c6.tar.gz
chromium_src-5c5b0d4df9d301521787f988a7b3bedc4ba9f3c6.tar.bz2
Run APK tests on the android_test trybot.
Test failures are ignored for now. TBR=mark@chromium.org,tsepez@chromium.org BUG=125059 TEST= Review URL: https://chromiumcodereview.appspot.com/10387086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r--base/base.gyp3
1 files changed, 2 insertions, 1 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 7b4f970..52df286 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -668,12 +668,13 @@
# a template, and builds them.
'action_name': 'generate_and_build',
'inputs': [
+ '../testing/android/AndroidManifest.xml',
'../testing/android/generate_native_test.py',
'<(PRODUCT_DIR)/lib.target/libbase_unittests.so',
'<(PRODUCT_DIR)/lib.java/chromium_base.jar'
],
'outputs': [
- '<(PRODUCT_DIR)/ChromeNativeTests_base_unittests-debug.apk',
+ '<(PRODUCT_DIR)/base_unittests_apk/base_unittests-debug.apk',
],
'action': [
'../testing/android/generate_native_test.py',