build/apk_test.gypi - Issue 1034053002: [Android] Add an out-of-app instrumentation driver APK.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/apk_test.gypi

Issue 1034053002: [Android] Add an out-of-app instrumentation driver APK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: the rename Created 5 years, 8 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

« no previous file with comments | « build/android/pylib/remote/device/remote_device_test_run.py ('k') | build/java.gypi » ('j') | testing/android/java/src/org/chromium/test/driver/AndroidManifest.xml » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/apk_test.gypi

diff --git a/build/apk_test.gypi b/build/apk_test.gypi

index 05bafab75d827310b42f3f6e858fe984cb57820c..eb648be269bd2d4c532286f2d61f58cdaa52a576 100644

--- a/build/apk_test.gypi

+++ b/build/apk_test.gypi

@@ -22,16 +22,19 @@

'<(DEPTH)/base/base.gyp:base_java',

'<(DEPTH)/build/android/pylib/device/commands/commands.gyp:chromium_commands',

'<(DEPTH)/build/android/pylib/remote/device/dummy/dummy.gyp:remote_device_dummy_apk',

+ '<(DEPTH)/testing/android/test_support.gyp:test_support_java',

'<(DEPTH)/tools/android/android_tools.gyp:android_tools',

'conditions': [

['OS == "android"', {

'variables': {

# These are used to configure java_apk.gypi included below.

+ 'android_manifest_path': '<(DEPTH)/testing/android/java/AndroidManifest.xml',

'apk_name': '<(test_suite_name)',

'intermediate_dir': '<(PRODUCT_DIR)/<(test_suite_name)_apk',

'final_apk_path': '<(intermediate_dir)/<(test_suite_name)-debug.apk',

- 'java_in_dir': '<(DEPTH)/testing/android/java',

+ 'java_in_dir': '<(DEPTH)/testing/android/java/src/org/chromium/native_test',

Yaron 2015/04/07 15:39:04 See my comments below. If you agree, then I think

jbudorick 2015/04/07 19:24:44 reverted + adjusted for moving testing/android/jav

+ 'java_in_dir_suffix': '',

'native_lib_target': 'lib<(test_suite_name)',

# TODO(yfriedman, cjhopman): Support managed installs for gtests.

'gyp_managed_install': 0,