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

Side by Side Diff: third_party/custom_tabs_client/BUILD.gn

Issue 1829823002: Replace usages of DEPRECATED_java_in_dir with java_files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: zap random comment Created 4 years, 9 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 unified diff | Download patch
« no previous file with comments | « third_party/cacheinvalidation/BUILD.gn ('k') | tools/android/customtabs_benchmark/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/android/rules.gni") 5 import("//build/config/android/rules.gni")
6 6
7 android_resources("chrome_tabs_client_example_apk_resources") { 7 android_resources("chrome_tabs_client_example_apk_resources") {
8 resource_dirs = [ "src/Application/src/main/res" ] 8 resource_dirs = [ "src/Application/src/main/res" ]
9 android_manifest = "src/Application/src/main/AndroidManifest.xml" 9 android_manifest = "src/Application/src/main/AndroidManifest.xml"
10 custom_package = "org.chromium.customtabsclient" 10 custom_package = "org.chromium.customtabsclient"
11 } 11 }
12 12
13 android_apk("custom_tabs_client_example_apk") { 13 android_apk("custom_tabs_client_example_apk") {
14 DEPRECATED_java_in_dir = "src/Application/src/main/java" 14 java_files = [ "src/Application/src/main/java/org/chromium/customtabsclient/Ma inActivity.java" ]
15 android_manifest = "src/Application/src/main/AndroidManifest.xml" 15 android_manifest = "src/Application/src/main/AndroidManifest.xml"
16 apk_name = "CustomTabsClientExample" 16 apk_name = "CustomTabsClientExample"
17 deps = [ 17 deps = [
18 ":chrome_tabs_client_example_apk_resources", 18 ":chrome_tabs_client_example_apk_resources",
19 ":custom_tabs_client_shared_lib", 19 ":custom_tabs_client_shared_lib",
20 ":custom_tabs_support_lib", 20 ":custom_tabs_support_lib",
21 ] 21 ]
22 chromium_code = false 22 chromium_code = false
23 } 23 }
24 24
25 android_library("custom_tabs_client_shared_lib") { 25 android_library("custom_tabs_client_shared_lib") {
26 DEPRECATED_java_in_dir = 26 java_files = [
27 "src/shared/src/main/java/org/chromium/customtabsclient/shared" 27 "src/shared/src/main/java/org/chromium/customtabsclient/shared/CustomTabsHel per.java",
28 "src/shared/src/main/java/org/chromium/customtabsclient/shared/KeepAliveServ ice.java",
29 "src/shared/src/main/java/org/chromium/customtabsclient/shared/ServiceConnec tionCallback.java",
30 "src/shared/src/main/java/org/chromium/customtabsclient/shared/ServiceConnec tion.java",
31 ]
32
28 deps = [ 33 deps = [
29 ":custom_tabs_support_lib", 34 ":custom_tabs_support_lib",
30 ] 35 ]
31 } 36 }
32 37
33 android_library("custom_tabs_support_lib") { 38 android_library("custom_tabs_support_lib") {
34 DEPRECATED_java_in_dir = "src/customtabs/src" 39 java_files = [
40 "src/customtabs/src/android/support/customtabs/CustomTabsCallback.java",
41 "src/customtabs/src/android/support/customtabs/CustomTabsClient.java",
42 "src/customtabs/src/android/support/customtabs/CustomTabsIntent.java",
43 "src/customtabs/src/android/support/customtabs/CustomTabsService.java",
44 "src/customtabs/src/android/support/customtabs/CustomTabsServiceConnection.j ava",
45 "src/customtabs/src/android/support/customtabs/CustomTabsSession.java",
46 "src/customtabs/src/android/support/customtabs/CustomTabsSessionToken.java",
47 ]
35 deps = [ 48 deps = [
36 "//third_party/android_tools:android_support_v13_java", 49 "//third_party/android_tools:android_support_v13_java",
37 ] 50 ]
38 srcjar_deps = [ ":chrome_custom_tabs_service_aidl" ] 51 srcjar_deps = [ ":chrome_custom_tabs_service_aidl" ]
39 } 52 }
40 53
41 android_aidl("chrome_custom_tabs_service_aidl") { 54 android_aidl("chrome_custom_tabs_service_aidl") {
42 interface_file = "common.aidl" 55 interface_file = "common.aidl"
43 56
44 java_in_dir = "src/customtabs/src/android/support/customtabs" 57 java_in_dir = "src/customtabs/src/android/support/customtabs"
45 sources = [ 58 sources = [
46 "$java_in_dir/ICustomTabsCallback.aidl", 59 "$java_in_dir/ICustomTabsCallback.aidl",
47 "$java_in_dir/ICustomTabsService.aidl", 60 "$java_in_dir/ICustomTabsService.aidl",
48 ] 61 ]
49 } 62 }
OLDNEW
« no previous file with comments | « third_party/cacheinvalidation/BUILD.gn ('k') | tools/android/customtabs_benchmark/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698