Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1872)

Unified Diff: base/base.gyp

Issue 10387086: Run APK tests on the android_test trybot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix naming of functions in buildbot_functions.sh Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/android/base_jni_registrar.cc ('k') | build/android/buildbot_functions.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 6f403fccdbee24c5f3880698da11110b63b749a1..21c1605d63b2bc729862a68a5394baee4b7d0dfb 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -667,12 +667,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',
« no previous file with comments | « base/android/base_jni_registrar.cc ('k') | build/android/buildbot_functions.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698