diff options
| author | qinmin <qinmin@chromium.org> | 2014-08-27 16:01:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-27 23:05:47 +0000 |
| commit | 22b41158f1be60572f4eaa1da8676c36f69cb394 (patch) | |
| tree | 192388f709b003a1d859429e68180b9643d8ebae /remoting/remoting_android.gypi | |
| parent | 39a6a1b1e570f54aaa957095400b6d40aae0e0f1 (diff) | |
| download | chromium_src-22b41158f1be60572f4eaa1da8676c36f69cb394.zip chromium_src-22b41158f1be60572f4eaa1da8676c36f69cb394.tar.gz chromium_src-22b41158f1be60572f4eaa1da8676c36f69cb394.tar.bz2 | |
Use content URI to upload photos taken by camera
Currently chrome creates a file path when uploading a photo taken through camera
However, this doesn't always work.
Instead, we should use content URI. See more details in the crbug.
BUG=405593
Review URL: https://codereview.chromium.org/489053003
Cr-Commit-Position: refs/heads/master@{#292257}
Diffstat (limited to 'remoting/remoting_android.gypi')
| -rw-r--r-- | remoting/remoting_android.gypi | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi index b9f0778..744b302 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', { |