Skip to content

Commit

Permalink
customtabs: Move the build files for the sample application to Chromium.
Browse files Browse the repository at this point in the history
Review URL: https://codereview.chromium.org/1270403003

Cr-Commit-Position: refs/heads/master@{#343129}
  • Loading branch information
lizeb authored and Commit bot committed Aug 12, 2015
1 parent 2e7068d commit 73fc210
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 1 deletion.
2 changes: 1 addition & 1 deletion build/all.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@
'../chrome/chrome.gyp:chrome_shell_uiautomator_tests',
'../chrome/chrome.gyp:chromedriver_webview_shell_apk',
'../chrome/chrome.gyp:unit_tests_apk',
'../third_party/custom_tabs_client/src/custom_tabs_client.gyp:custom_tabs_client_example_apk',
'../third_party/custom_tabs_client/custom_tabs_client.gyp:custom_tabs_client_example_apk',
],
}],
],
Expand Down
6 changes: 6 additions & 0 deletions third_party/custom_tabs_client/common.aidl
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Copyright 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.

interface android.support.customtabs.ICustomTabsService;
interface android.support.customtabs.ICustomTabsCallback;
52 changes: 52 additions & 0 deletions third_party/custom_tabs_client/custom_tabs_client.gyp
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# 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': {
'java_in_dir': 'src/Application/src/main/',
'java_in_dir_suffix': 'java/',
'resource_dir': '<(java_in_dir)/res',
'apk_name': 'CustomTabsClientExample',
'run_findbugs': 0,
},
'dependencies': [
'custom_tabs_support_lib',
],
'includes': [ '../../build/java_apk.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',
],
'includes': [ '../../build/java.gypi' ],
},
{
'target_name': "chrome_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' ],
},
],
}

0 comments on commit 73fc210

Please sign in to comment.