build/apk_test.gypi - Issue 2044523003: Revert of 👔 Reland of Move side-loaded test data /sdcard -> /sdcard/gtestdata

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 2044523003: Revert of 👔 Reland of Move side-loaded test data /sdcard -> /sdcard/gtestdata (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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: build/apk_test.gypi

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

index 0a482aedc60aae5dfc942556fc4cb2bd283c8c9c..6512b6d9f65573d7cef43aa406c7887f8125b0fe 100644

--- a/build/apk_test.gypi

+++ b/build/apk_test.gypi

@@ -24,7 +24,6 @@

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

'<(DEPTH)/testing/android/appurify_support.gyp:appurify_support_java',

'<(DEPTH)/testing/android/on_device_instrumentation.gyp:reporter_java',

- '<(DEPTH)/testing/android/native_test.gyp:native_test_java',

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

'conditions': [

@@ -34,9 +33,8 @@

'test_type': 'gtest',

'apk_name': '<(test_suite_name)',

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

- 'java_in_dir': '<(DEPTH)/build/android/empty',

- 'android_manifest_path%': '<(DEPTH)/testing/android/native_test/java/AndroidManifest.xml',

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

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

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

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

'gyp_managed_install': 0,

« no previous file with comments | « build/android/pylib/remote/device/remote_device_test_run.py ('k') | chrome/common/chrome_paths.cc » ('j') | no next file with comments »