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

Unified Diff: content/content_tests.gypi

Issue 10914130: Make apks be built in a consistent way (Closed) Base URL: http://git.chromium.org/chromium/src.git@ant_ijpforrealz
Patch Set: 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
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index c47b2dadcbc39ed107cec2764f6d3a9a60205a00..56f7cc3bb0fddffd38b13f448babbf4148353905 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -819,35 +819,13 @@
'../net/net.gyp:net_javatests',
'../tools/android/forwarder/forwarder.gyp:forwarder',
],
- 'actions': [
- {
- 'action_name': 'content_shell_test_generate_apk',
- 'inputs': [
- '../build/android/ant/common.xml',
- '../build/android/ant/sdk-targets.xml',
- '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk.xml',
- '<(DEPTH)/content/shell/android/javatests/AndroidManifest.xml',
- '>@(input_jars_paths)',
- '<!@(find <(DEPTH)/content/shell/android/javatests/ -name "*.java")'
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/content_shell_test/ContentShellTest-debug.apk',
- ],
- 'action': [
- 'ant',
- '-DPRODUCT_DIR=<(ant_build_out)',
- '-DAPP_ABI=<(android_app_abi)',
- '-DANDROID_SDK=<(android_sdk)',
- '-DANDROID_SDK_ROOT=<(android_sdk_root)',
- '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
- '-DANDROID_SDK_VERSION=<(android_sdk_version)',
- '-DANDROID_GDBSERVER=<(android_gdbserver)',
- '-DINPUT_JARS_PATHS=>(input_jars_paths)',
- '-buildfile',
- '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk.xml',
- ]
- }
- ],
+ 'variables': {
+ 'package_name': 'content_shell_test',
+ 'apk_name': 'ContentShellTest',
+ 'java_in_dir': 'shell/android/javatests',
+ 'resource_dir': 'shell/android/res',
Ted C 2012/09/07 20:21:10 blast...proven wrong again. Does the test actuall
+ },
+ 'includes': [ '../build/java_apk.gypi' ],
},
],
}],

Powered by Google App Engine
This is Rietveld 408576698