build/apk_test.gypi - Issue 1124763003: Update from https://crrev.com/327068

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 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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:

Index: build/apk_test.gypi

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

index 05bafab75d827310b42f3f6e858fe984cb57820c..792d92cac545c6130a8927705832433238b71e8f 100644

--- a/build/apk_test.gypi

+++ b/build/apk_test.gypi

@@ -31,7 +31,7 @@

'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/native_test/java',

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

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

'gyp_managed_install': 0,