net/net.gyp - Issue 512923002: Add support for Android aidl and support for gyp's java_in_dir

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: net/net.gyp

Issue 512923002: Add support for Android aidl and support for gyp's java_in_dir (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 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: net/net.gyp

diff --git a/net/net.gyp b/net/net.gyp

index 6fa0f62c32244182412a8d5354ea448d08e02c1f..eb6d360b6dd8b35baf212b6cde6da0800f632eb9 100644

--- a/net/net.gyp

+++ b/net/net.gyp

@@ -1664,10 +1664,6 @@

'includes': [ '../build/android/java_cpp_template.gypi' ],

- ],

- }],

- ['OS == "android"', {

newt (away) 2014/08/27 20:05:29 why was this here to begin with?

cjhopman 2014/08/27 21:05:22 idk, the condition block above it has the exact sa

- 'targets': [

{

'target_name': 'net_unittests_apk',

'type': 'none',

« build/config/android/rules.gni ('K') | « net/BUILD.gn ('k') | third_party/eyesfree/BUILD.gn » ('j') | no next file with comments »