content/content_tests.gypi - Issue 10911131: Upstream JavaBridge tests.

Unified Diff: content/content_tests.gypi

Issue 10911131: Upstream JavaBridge tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove target content_javatests 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

« no previous file with comments | « content/content_shell.gypi ('k') | content/public/android/javatests/src/org/chromium/content/browser/ContentViewTestBase.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_tests.gypi

diff --git a/content/content_tests.gypi b/content/content_tests.gypi

index 9136d5759330d200ae3911e97f40ce5c17567349..dec64f5e51dca46a4419677ad858da1c06772b97 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -863,7 +863,7 @@

['OS == "android"', {

'targets': [

{

- 'target_name': 'content_javatests',

+ 'target_name': 'content_java_test_support',

'type': 'none',

'dependencies': [

'../base/base.gyp:base',

@@ -872,23 +872,28 @@

'content_java',

'variables': {

- 'package_name': 'content_javatests',

- 'java_in_dir': '../content/public/android/javatests',

+ 'package_name': 'content_java_test_support',

+ 'java_in_dir': '../content/public/test/android/javatests',

'includes': [ '../build/java.gypi' ],

{

- 'target_name': 'content_java_test_support',

+ 'target_name': 'content_shell_javatests',

Yaron 2012/09/25 22:43:16 Just discussed with Chris. We don't actually need

Ramya 2012/09/25 22:49:54 Done.

'type': 'none',

'dependencies': [

- '../base/base.gyp:base',

- '../base/base.gyp:base_java_test_support',

- 'content_common',

'content_java',

+ 'content_shell_java',

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

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

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

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

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

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

+ '../tools/android/forwarder/forwarder.gyp:forwarder',

'variables': {

- 'package_name': 'content_java_test_support',

- 'java_in_dir': '../content/public/test/android/javatests',

+ 'package_name': 'content_shell_javatests',

+ 'java_in_dir': '../content/shell/android/javatests',

'includes': [ '../build/java.gypi' ],

@@ -897,7 +902,7 @@

'type': 'none',

'dependencies': [

'content_java',

- 'content_javatests',

+ 'content_java_test_support',

'content_shell_apk',

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

'../base/base.gyp:base_java_test_support',

@@ -910,8 +915,9 @@

'variables': {

'package_name': 'content_shell_test',

'apk_name': 'ContentShellTest',

- 'java_in_dir': 'shell/android/javatests',

+ 'java_in_dir': '../content/shell/android/javatests',

'resource_dir': '../res',

+ 'additional_input_paths': ['<!@(find ../content/public/android/javatests/src -name "*.java")',],

'includes': [ '../build/java_apk.gypi' ],