chrome/chrome_android.gypi - Issue 10943014: Add support for the ChromiumTestShellTest APK.

Unified Diff: chrome/chrome_android.gypi

Issue 10943014: Add support for the ChromiumTestShellTest APK. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Updated gyp/ant rules 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

« chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.java ('K') | « chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellUrlTest.java ('k') | chrome/chrome_tests.gypi » ('j') | chrome/chrome_tests.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_android.gypi

diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi

index 3fc4bd7d3911d19e89b5c3d978d0227561114cb8..cfe230f9d00c10a48153b09e48e65aba98978de2 100644

--- a/chrome/chrome_android.gypi

+++ b/chrome/chrome_android.gypi

@@ -39,6 +39,12 @@

'target_name': 'chromium_testshell',

'type': 'none',

'dependencies': [

+ '../base/base.gyp:base_java',

+ '../content/content.gyp:content_java',

+ '../media/media.gyp:media_java',

+ '../net/net.gyp:net_java',

+ #'browser/component/components.gyp:web_contents_delegate_android_java'

Ted C 2012/09/19 21:18:49 remove?

David Trainor- moved to gerrit 2012/09/20 02:28:17 Done.

+ 'chrome.gyp:chrome_java',

'chrome_android_paks',

'libchromiumtestshell',

@@ -59,16 +65,12 @@

'action_name': 'chromium_testshell_generate_apk',

'inputs': [

'<@(chrome_android_pak_output_resources)',

- '<!@(find android/testshell/java/src -name "*.java")',

# TODO(dtrainor): Uncomment these once resources are added.

#'<!@(find android/testshell/java/res -name "*.png")',

#'<!@(find android/testshell/java/res -name "*.xml")',

- '<(PRODUCT_DIR)/lib.java/chromium_base.jar',

- '<(PRODUCT_DIR)/lib.java/chromium_net.jar',

- '<(PRODUCT_DIR)/lib.java/chromium_media.jar',

- '<(PRODUCT_DIR)/lib.java/chromium_content.jar',

- '<(PRODUCT_DIR)/lib.java/chromium_chrome.jar',

- '<(PRODUCT_DIR)/lib.java/chromium_web_contents_delegate_android.jar',

+ # Right now comment out the find call, relying on the jar version instead.

Ted C 2012/09/19 21:18:49 huh? what does this mean? Should this be a TODO

David Trainor- moved to gerrit 2012/09/20 02:28:17 Sorry, remnants of my fight with gyp and ant. On

+ '<!@(find android/testshell/java/src -name "*.java")',

+ '>@(input_jars_paths)',

'<(PRODUCT_DIR)/chromium_testshell/libs/<(android_app_abi)/libchromiumtestshell.so'

'outputs': [

@@ -84,6 +86,7 @@

'-DANDROID_SDK_VERSION=<(android_sdk_version)',

'-DANDROID_GDBSERVER=<(android_gdbserver)',

'-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)',

+ '-DINPUT_JARS_PATHS=>(input_jars_paths)',

'-buildfile',

'<(DEPTH)/chrome/android/testshell/java/chromium_testshell_apk.xml',