webrtc/api/api_java.gyp - Issue 2111823002: Combine webrtc/api/java/android and webrtc/api/java/src.

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: webrtc/api/api_java.gyp

Issue 2111823002: Combine webrtc/api/java/android and webrtc/api/java/src. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.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: webrtc/api/api_java.gyp

diff --git a/webrtc/api/api_java.gyp b/webrtc/api/api_java.gyp

index e69f0e2789cb23fab81a82ca91dfb2c139d13ca4..4e18035613e0993fbd0df06bbfa48f9ba58df087 100644

--- a/webrtc/api/api_java.gyp

+++ b/webrtc/api/api_java.gyp

@@ -34,14 +34,12 @@

'android_manifest_path': '<(webrtc_root)/build/android/AndroidManifest.xml',

'suppressions_file': '<(webrtc_root)/build/android/suppressions.xml',

'chromium_code': 1,

- 'java_in_dir': 'java',

+ 'java_in_dir': 'android/java',

'webrtc_base_dir': '<(webrtc_root)/base',

'webrtc_modules_dir': '<(webrtc_root)/modules',

'additional_src_dirs' : [

- 'java/android',

- '<(webrtc_base_dir)/java/src',

+ '<(webrtc_base_dir)/java',

'<(webrtc_modules_dir)/audio_device/android/java/src',

'includes': ['../../build/java.gypi'],

« no previous file with comments | « webrtc/api/api.gyp ('k') | webrtc/api/java/README » ('j') | no next file with comments »