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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_shell.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') | « build/java.gypi ('k') | content/content_tests.gypi » ('j') | content/shell/android/java/content_shell_apk.xml » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index e57998ba06d381e2a9d91aa48b7f6831a9d7be07..4b930046bae5525a15d5693cef640278debe8f41 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -627,7 +627,8 @@
# Release mode. I don't think it matters (e.g. we're
# probably happy to not codesign) but naming should be
# fixed.
- '<(PRODUCT_DIR)/content_shell/ContentShell-debug.apk',
+ '<(PRODUCT_DIR)/apks/ContentShell-debug.apk',
+ '<(PRODUCT_DIR)/test.lib.java/ContentShell-debug.jar',
],
'action': [
# Pass the build type to ant. Currently it only assumes
@@ -642,6 +643,7 @@
'-DANDROID_SDK_VERSION=<(android_sdk_version)',
'-DANDROID_GDBSERVER=<(android_gdbserver)',
'-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)',
+ '-DCHROMIUM_SRC=<(ant_build_out)/../..',
'-buildfile',
'shell/android/java/content_shell_apk.xml',
],
« build/android/pylib/test_options_parser.py ('K') | « build/java.gypi ('k') | content/content_tests.gypi » ('j') | content/shell/android/java/content_shell_apk.xml » ('J')

Powered by Google App Engine
This is Rietveld 408576698