Use third_party/custom_tabs_client as the src for customtabs library

third_party/custom_tabs_client/custom_tabs_client.gyp

 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'custom_tabs_client_example_apk',
       'type': 'none',
       'variables': {
@@ skipping 22 matching lines @@
       'includes': [ '../../build/java.gypi' ],
     },
     {
       'target_name': 'custom_tabs_support_lib',
       'type': 'none',
       'variables': {
         'java_in_dir': 'src/customtabs/src/',
         'java_in_dir_suffix': '',
       },
       'dependencies': [
-        'chrome_custom_tabs_service_aidl',
-        '../android_tools/android_tools.gyp:android_support_annotations_javalib',
+        'custom_tabs_service_aidl',
+        '../android_tools/android_tools.gyp:android_support_v13_javalib',

[Benoit L, 2015/08/21 11:20:47]

Stupid question: Doesn't this bloat the final .dex file?
Hopefully proguard should help us in this case, but does it run for debug
builds?

[pasko, 2015/08/21 11:54:57]

content_java already depends on it :(

Still a confusing dependency, please write a detailed comment here what
problems/conflicts pop up if we don't do this.

       ],
       'includes': [ '../../build/java.gypi' ],
     },
     {
-      'target_name': "chrome_custom_tabs_service_aidl",
+      'target_name': "custom_tabs_service_aidl",
       'type': 'none',
       'variables': {
         'java_in_dir': 'src/customtabs/src/android/support/customtabs/',
         'java_in_dir_suffix': '',
         # The filename should not end with ".aidl", as it upsets gradle.
         # 'aidl_interface_file': '<(java_in_dir)/common.aidl.txt',
         'aidl_interface_file': 'common.aidl',
       },
       'sources': [
         '<(java_in_dir)/ICustomTabsCallback.aidl',
         '<(java_in_dir)/ICustomTabsService.aidl',
       ],
       'includes': [ '../../build/java_aidl.gypi' ],
     },
   ],
 }