OLD | NEW |
1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 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 if (is_android) { | 5 if (is_android) { |
6 import("//build/config/android/config.gni") | 6 import("//build/config/android/config.gni") |
7 import("//build/config/android/rules.gni") | 7 import("//build/config/android/rules.gni") |
8 } | 8 } |
9 | 9 |
10 source_set("settings") { | 10 source_set("settings") { |
11 visibility = [ "//blimp/client/*" ] | 11 visibility = [ |
| 12 "//blimp/client/app:*", # TODO(nyquist): Remove this. See crbug/651964. |
| 13 "//blimp/client/core/*", |
| 14 ] |
12 | 15 |
13 sources = [ | 16 sources = [ |
14 "blimp_settings_delegate.h", | 17 "blimp_settings_delegate.h", |
15 "settings_feature.cc", | 18 "settings_feature.cc", |
16 "settings_feature.h", | 19 "settings_feature.h", |
17 ] | 20 ] |
18 | 21 |
19 deps = [ | 22 deps = [ |
20 "//blimp/common", | 23 "//blimp/common", |
21 "//net", | 24 "//net", |
(...skipping 13 matching lines...) Expand all Loading... |
35 deps += [ | 38 deps += [ |
36 ":settings_jni_headers", | 39 ":settings_jni_headers", |
37 "//blimp/client/core/session", | 40 "//blimp/client/core/session", |
38 "//blimp/common", | 41 "//blimp/common", |
39 ] | 42 ] |
40 } | 43 } |
41 } | 44 } |
42 | 45 |
43 if (is_android) { | 46 if (is_android) { |
44 android_library("settings_java") { | 47 android_library("settings_java") { |
45 visibility = [ "//blimp/client/*" ] | 48 visibility = [ |
| 49 "//blimp/client/app:*", # TODO(nyquist): Remove this. See crbug/651964. |
| 50 "//blimp/client/core/*", |
| 51 ] |
46 | 52 |
47 java_files = [ | 53 java_files = [ |
48 "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.j
ava", | 54 "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.j
ava", |
49 "android/java/src/org/chromium/blimp/core/settings/BlimpPreferencesDelegat
e.java", | 55 "android/java/src/org/chromium/blimp/core/settings/BlimpPreferencesDelegat
e.java", |
50 ] | 56 ] |
51 | 57 |
52 # TODO(xingliu): Clean resources files in the future. http://crbug.com/63068
7. | 58 # TODO(xingliu): Clean resources files in the future. http://crbug.com/63068
7. |
53 deps = [ | 59 deps = [ |
54 "//base:base_java", | 60 "//base:base_java", |
55 "//blimp/client:blimp_java_resources", | 61 "//blimp/client/app:blimp_java_resources", |
56 "//blimp/client/core/common:common_java", | 62 "//blimp/client/core/common:common_java", |
57 "//blimp/client/public:public_headers_java", | 63 "//blimp/client/public:public_headers_java", |
58 "//components/signin/core/browser/android:java", | 64 "//components/signin/core/browser/android:java", |
59 "//components/sync/android:sync_java", | 65 "//components/sync/android:sync_java", |
60 "//third_party/android_tools:android_support_v7_appcompat_java", | 66 "//third_party/android_tools:android_support_v7_appcompat_java", |
61 ] | 67 ] |
62 } | 68 } |
63 | 69 |
64 generate_jni("settings_jni_headers") { | 70 generate_jni("settings_jni_headers") { |
65 visibility = [ ":*" ] | 71 visibility = [ ":*" ] |
66 | 72 |
67 sources = [ | 73 sources = [ |
68 "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.j
ava", | 74 "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.j
ava", |
69 ] | 75 ] |
70 | 76 |
71 jni_package = "blimp/client/core/settings" | 77 jni_package = "blimp/client/core/settings" |
72 } | 78 } |
73 } | 79 } |
OLD | NEW |