components/cronet.gypi - 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: components/cronet.gypi

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: rebase 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

« no previous file with comments | « components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkType.template ('k') | components/cronet/android/chromium_url_request.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cronet.gypi

diff --git a/components/cronet.gypi b/components/cronet.gypi

index 8a51dbb3eaa9b6749d1a379393454f97a2737934..a2a3409bc4de2c5b0d77b6352d918d55d82d8f86 100644

--- a/components/cronet.gypi

+++ b/components/cronet.gypi

@@ -20,28 +20,12 @@

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

{

- 'target_name': 'cronet_url_request_error_list',

+ 'target_name': 'cronet_url_request_java',

'type': 'none',

- 'sources': [

- 'cronet/android/java/src/org/chromium/net/ChromiumUrlRequestError.template',

- ],

'variables': {

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

- 'template_deps': ['cronet/android/chromium_url_request_error_list.h'],

+ 'source_file': 'cronet/android/chromium_url_request.h',

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

- },

- {

- 'target_name': 'cronet_url_request_priority_list',

- 'type': 'none',

- 'sources': [

- 'cronet/android/java/src/org/chromium/net/ChromiumUrlRequestPriority.template',

- ],

- 'variables': {

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

- 'template_deps': ['cronet/android/chromium_url_request_priority_list.h'],

- },

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

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

{

'target_name': 'cronet_url_request_context_config_list',

@@ -111,8 +95,7 @@

'../third_party/icu/icu.gyp:icuuc',

'cronet_jni_headers',

'cronet_url_request_context_config_list',

- 'cronet_url_request_error_list',

- 'cronet_url_request_priority_list',

+ 'cronet_url_request_java',

'cronet_version',

'../net/net.gyp:net',

@@ -210,8 +193,7 @@

'dependencies': [

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

'cronet_stub',

- 'cronet_url_request_error_list',

- 'cronet_url_request_priority_list',

+ 'cronet_url_request_java',

'libcronet',

'variables': {