talk/build/common.gypi - Issue 1610243002: Move talk/app/webrtc to webrtc/api

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: talk/build/common.gypi

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Updated location for peerconnection_unittests.isolate Created 4 years, 11 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: talk/build/common.gypi

diff --git a/talk/build/common.gypi b/talk/build/common.gypi

index 061b06ba70dd7e2274382724e8f84c99b29a7781..e1242d147880ff5cdc99b977842486e2a71b7703 100644

--- a/talk/build/common.gypi

+++ b/talk/build/common.gypi

@@ -34,11 +34,6 @@

# TODO(ronghuawu): For now, disable the Chrome plugins, which causes a

# flood of chromium-style warnings.

'clang_use_chrome_plugins%': 0,

- 'conditions': [

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

- 'java_home%': '<!(python -c "import os; dir=os.getenv(\'JAVA_HOME\', \'/usr/lib/jvm/java-7-openjdk-amd64\'); assert os.path.exists(os.path.join(dir, \'include/jni.h\')), \'Point \\$JAVA_HOME or the java_home gyp variable to a directory containing include/jni.h!\'; print dir")',

- }],

- ],

# Disable these to not build components which can be externally provided.

'build_expat%': 1,

'build_json%': 1,

« no previous file with comments | « talk/build/build_jar.sh ('k') | talk/libjingle.gyp » ('j') | talk/libjingle.gyp » ('J')