media/media.gyp - Issue 659493003: Final step of the java_cpp_template -> java_cpp_enum migration.

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

Issue 659493003: Final step of the java_cpp_template -> java_cpp_enum migration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: mmenke+yfriedman feedback + more aosp fixes + don't run tests as part of the build Created 6 years, 2 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

« build/android/gyp/java_cpp_enum.py ('K') | « media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java ('k') | media/video/capture/android/video_capture_device_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/media.gyp

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

index 9b2b50fc4c1ff7c4b1fc9fadd23c3089cdc368ed..7929a2566698127a2a01fa4e3a34ad77eb206bd5 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -1811,7 +1811,7 @@

'type': 'none',

'dependencies': [

'../base/base.gyp:base',

- 'media_android_imageformat_list',

+ 'media_android_imageformat',

'export_dependent_settings': [

'../base/base.gyp:base',

@@ -1822,17 +1822,13 @@

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

{

- # GN: //media/base/android:media_android_imageformat_list

- 'target_name': 'media_android_imageformat_list',

+ # GN: //media/base/android:media_android_imageformat

+ 'target_name': 'media_android_imageformat',

'type': 'none',

- 'sources': [

- 'base/android/java/src/org/chromium/media/AndroidImageFormat.template',

- ],

'variables': {

- 'package_name': 'org/chromium/media',

- 'template_deps': ['video/capture/android/imageformat_list.h'],

+ 'source_file': 'video/capture/android/video_capture_device_android.h',

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

+ 'includes': [ '../build/android/java_cpp_enum.gypi' ],

}],