net/net.gyp - Issue 46303005: Fix chrome upload with content uri

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

Issue 46303005: Fix chrome upload with content uri (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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

« net/base/upload_content_url_element_reader_android.cc ('K') | « net/base/upload_content_url_element_reader_android.cc ('k') | ui/android/java/src/org/chromium/ui/SelectFileDialog.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/net.gyp

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

index 06f9e49f513a6fa340ded72b38329cf120b33e2d..9c9d5a92b43858348a6fc07d51a940736fae2af5 100644

--- a/net/net.gyp

+++ b/net/net.gyp

@@ -62,6 +62,8 @@

'sources': [

'android/cert_verify_result_android.h',

'android/cert_verify_result_android_list.h',

+ 'android/content_uri_utils.cc',

+ 'android/content_uri_utils.h',

'android/gurl_utils.cc',

'android/gurl_utils.h',

'android/keystore.cc',

@@ -113,6 +115,7 @@

'base/file_stream.h',

'base/file_stream_context.cc',

'base/file_stream_context.h',

+ 'base/file_stream_context_android.cc',

'base/file_stream_context_posix.cc',

'base/file_stream_context_win.cc',

'base/file_stream_metrics.cc',

@@ -220,6 +223,8 @@

'base/test_data_stream.h',

'base/upload_bytes_element_reader.cc',

'base/upload_bytes_element_reader.h',

+ 'base/upload_content_url_element_reader_android.cc',

+ 'base/upload_content_url_element_reader_android.h',

'base/upload_data.cc',

'base/upload_data.h',

'base/upload_data_stream.cc',

@@ -2855,6 +2860,7 @@

'sources': [

'android/java/src/org/chromium/net/AndroidKeyStore.java',

'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',

+ 'android/java/src/org/chromium/net/ContentUriUtils.java',

'android/java/src/org/chromium/net/GURLUtils.java',

'android/java/src/org/chromium/net/NetworkChangeNotifier.java',

'android/java/src/org/chromium/net/ProxyChangeListener.java',