third_party/android_media/android_media.gyp - Issue 1008603003: Move MediaController.java upstream to Chromium repository.

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

Issue 1008603003: Move MediaController.java upstream to Chromium repository. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix commit message Created 5 years, 9 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: third_party/android_media/android_media.gyp

diff --git a/third_party/android_data_chart/android_data_chart.gyp b/third_party/android_media/android_media.gyp

similarity index 51%

copy from third_party/android_data_chart/android_data_chart.gyp

copy to third_party/android_media/android_media.gyp

index 1610bd9ca5925dc4b33a96700bda296295e4338d..f6a1e25ccd937cdd4abcda6010db917d5b61dd69 100644

--- a/third_party/android_data_chart/android_data_chart.gyp

+++ b/third_party/android_media/android_media.gyp

@@ -3,15 +3,21 @@

# found in the LICENSE file.

{

+ 'variables': {

+ 'chromium_code': 1,

+ },

'targets': [

{

- 'target_name': 'android_data_chart_java',

+ 'target_name': 'android_media_java',

'type': 'none',

+ 'dependencies': [

+ '../android_tools/android_tools.gyp:android_support_v13_javalib',

+ ],

'variables': {

'java_in_dir': 'java',

'has_java_resources': 1,

- 'R_package': 'org.chromium.third_party.android',

- 'R_package_relpath': 'org/chromium/third_party/android',

+ 'R_package': 'org.chromium.third_party.android.media',

+ 'R_package_relpath': 'org/chromium/third_party/android/media',

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

« no previous file with comments | « third_party/android_media/README.chromium ('k') | third_party/android_media/java/res/layout/media_controller.xml » ('j') | no next file with comments »