build/java.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/java.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: Passenger -> Broker 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

Index: build/java.gypi

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

index 730fa2222a7417c1684ea6f23a40e17b058d4cb7..3eb18db6ce69f76f9ba7e6c6585b9e392937f700 100644

--- a/build/java.gypi

+++ b/build/java.gypi

@@ -101,6 +101,7 @@

'emma_instrument': '<(emma_instrument)',

'javac_jar_path': '<(javac_jar_path)',

+ 'java_in_dir_suffix%': '/src',

Yaron 2015/04/18 00:22:57 Seems unnecessary - please revert this file.

jbudorick 2015/04/20 19:21:38 Done.

'conditions': [

['add_to_dependents_classpaths == 1', {

@@ -250,7 +251,7 @@

'action_name': 'javac_<(_target_name)',

'message': 'Compiling <(_target_name) java sources',

'variables': {

- 'java_sources': ['>!@(find >(java_in_dir)/src >(additional_src_dirs) -name "*.java")'],

+ 'java_sources': ['>!@(find >(java_in_dir)>(java_in_dir_suffix) >(additional_src_dirs) -name "*.java")'],

'inputs': [

'<(DEPTH)/build/android/gyp/util/build_utils.py',

@@ -295,7 +296,7 @@

{

'variables': {

'src_dirs': [

- '<(java_in_dir)/src',

+ '<(java_in_dir)<(java_in_dir_suffix)',

'>@(additional_src_dirs)',

'stamp_path': '<(lint_stamp)',

« no previous file with comments | « build/apk_test.gypi ('k') | chrome/android/shell/javatests/AndroidManifest.xml » ('j') | chrome/chrome_tests.gypi » ('J')