Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2740)

Unified Diff: remoting/remoting_android.gypi

Issue 489053003: Use content URI to upload photos taken by camera (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add thread check Created 6 years, 4 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 | « chrome/chrome.gyp ('k') | ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting_android.gypi
diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi
index b9f07782046c6265da4868971b1f92a202f59a78..744b302ae197abfe5aa758814194ca001b9e825a 100644
--- a/remoting/remoting_android.gypi
+++ b/remoting/remoting_android.gypi
@@ -102,12 +102,12 @@
],
},
'dependencies': [
- 'android_support_v4_javalib_no_res',
'../base/base.gyp:base_java',
'../ui/android/ui_android.gyp:ui_java',
'remoting_android_resources',
'../third_party/android_tools/android_tools.gyp:android_support_v7_appcompat_javalib',
'../third_party/android_tools/android_tools.gyp:android_support_v7_mediarouter_javalib',
+ '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
],
'includes': [ '../build/java.gypi' ],
'conditions' : [
@@ -155,16 +155,6 @@
},
'includes': [ '../build/java_apk.gypi' ],
}, # end of target 'remoting_test_apk'
- {
- # This jar contains the Android support v4 libary. It does not have
- # any associated resources.
- 'target_name': 'android_support_v4_javalib_no_res',
- 'type': 'none',
- 'variables': {
- 'jar_path': '../third_party/android_tools/sdk/extras/android/support/v4/android-support-v4.jar',
- },
- 'includes': ['../build/java_prebuilt.gypi'],
- }, # end of target 'android_support_v4_javalib_no_res'
], # end of 'targets'
'conditions': [
['enable_cast==1', {
« no previous file with comments | « chrome/chrome.gyp ('k') | ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698