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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_tests.gypi

Issue 10905138: Add test jar generation logic for ant builds. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase Created 8 years, 3 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
« build/android/pylib/test_options_parser.py ('K') | « content/content_shell.gypi ('k') | content/shell/android/java/content_shell_apk.xml » ('j') | content/shell/android/java/content_shell_apk.xml » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index fcdd5d44fd45a1323a89efce7f4f2a4159546805..605767c2b4844801583f5993836a33f7e26d10d9 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -824,7 +824,8 @@
'<!@(find <(DEPTH)/content/shell/android/javatests/ -name "*.java")'
],
'outputs': [
- '<(PRODUCT_DIR)/content_shell_test/ContentShellTest-debug.apk',
+ '<(PRODUCT_DIR)/apks/ContentShellTest-debug.apk',
+ '<(PRODUCT_DIR)/test.lib.java/ContentShellTest-debug.jar',
],
'action': [
'ant',
@@ -835,6 +836,7 @@
'-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
'-DANDROID_SDK_VERSION=<(android_sdk_version)',
'-DANDROID_GDBSERVER=<(android_gdbserver)',
+ '-DCHROMIUM_SRC=<(ant_build_out)/../..',
'-buildfile',
'<(DEPTH)/content/shell/android/javatests/content_shell_test_apk.xml',
]
« build/android/pylib/test_options_parser.py ('K') | « content/content_shell.gypi ('k') | content/shell/android/java/content_shell_apk.xml » ('j') | content/shell/android/java/content_shell_apk.xml » ('J')

Powered by Google App Engine
This is Rietveld 408576698