diff options
| author | lambroslambrou <lambroslambrou@chromium.org> | 2015-02-12 11:27:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-12 19:28:16 +0000 |
| commit | 7495b6fd72a62119118ca2f0182844d8790cb77f (patch) | |
| tree | e2ce5d6b408f7b34f9122999e96cbbe0e8f06181 /remoting/remoting_android.gypi | |
| parent | c404e85f318501565ebd0c8b3541fbc2e260b158 (diff) | |
| download | chromium_src-7495b6fd72a62119118ca2f0182844d8790cb77f.zip chromium_src-7495b6fd72a62119118ca2f0182844d8790cb77f.tar.gz chromium_src-7495b6fd72a62119118ca2f0182844d8790cb77f.tar.bz2 | |
Update Chromoting to use Google Play Services from Android SDK
This CL removes the separate AndroidManifest.xml for Cast support, and
makes the Chromoting Android client unconditionally dependent on
Google Play Services, now that it is available in Chromium builds.
This library will allow us to add Cast support, use GoogleAuthUtil,
improve the account-switching UX, and maybe other stuff as well.
BUG=403850,417799
Review URL: https://codereview.chromium.org/906403005
Cr-Commit-Position: refs/heads/master@{#316024}
Diffstat (limited to 'remoting/remoting_android.gypi')
| -rw-r--r-- | remoting/remoting_android.gypi | 56 |
1 files changed, 3 insertions, 53 deletions
diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi index 0bc1d8c..b6d77c8 100644 --- a/remoting/remoting_android.gypi +++ b/remoting/remoting_android.gypi @@ -43,16 +43,8 @@ { 'target_name': 'remoting_apk_manifest', 'type': 'none', - 'conditions': [ - ['enable_cast==1', { - 'sources': [ - 'android/cast/AndroidManifest.xml.jinja2' - ], - }, { # 'enable_cast != 1' - 'sources': [ - 'android/java/AndroidManifest.xml.jinja2', - ], - }], + 'sources': [ + 'android/java/AndroidManifest.xml.jinja2', ], 'rules': [{ 'rule_name': 'generate_manifest', @@ -92,6 +84,7 @@ '../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', + '../third_party/android_tools/android_tools.gyp:google_play_services_javalib', ], 'includes': [ '../build/java.gypi' ], 'conditions' : [ @@ -101,9 +94,6 @@ 'android/cast', ], }, - 'dependencies': [ - 'google_play_services_javalib', - ], }], ], }, @@ -140,46 +130,6 @@ 'includes': [ '../build/java_apk.gypi' ], }, # end of target 'remoting_test_apk' ], # end of 'targets' - 'conditions': [ - ['enable_cast==1', { - 'targets': [ - { - # This jar contains the Google Play services library without the - # resources needed for the library to work. See crbug.com/274697 or - # ../third_party/android_tools/android_tools.gyp for more info. - # This target will fail to build unless you have a local version - # of the Google Play services jar. - 'target_name': 'google_play_services_javalib_no_res', - 'type': 'none', - 'variables': { - 'jar_path': 'android/google-play-services_lib/libs/google-play-services.jar', - }, - 'includes': ['../build/java_prebuilt.gypi'], - - }, # end of target 'google_play_services_javalib_no_res' - { - # This target contains the Google Play services library with the - # resources needed. It will fail to build unless you have a local - # version of the Google Play services libary project. - # TODO(aiguha): Solve issue of needing to use local version. Also, - # watch crbug.com/274697. - 'target_name': 'google_play_services_javalib', - 'type': 'none', - 'variables': { - 'java_in_dir': 'android/google-play-services_lib/', - 'R_package': ['com.google.android.gms'], - 'R_package_relpath': ['com/google/android/gms'], - 'has_java_resources': 1, - 'res_v14_verify_only': 1, - }, - 'dependencies': [ - 'google_play_services_javalib_no_res', - ], - 'includes': ['../build/java.gypi'], - }, # end of target 'google_play_services_javalib' - ], # end of targets - }], - ], }], # 'OS=="android"' ['OS=="android"', { |