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 = [ "//blimp/client/*" ] |
12 | 12 |
13 sources = [ | 13 sources = [ |
| 14 "blimp_settings_delegate.h", |
14 "settings_feature.cc", | 15 "settings_feature.cc", |
15 "settings_feature.h", | 16 "settings_feature.h", |
16 ] | 17 ] |
17 | 18 |
18 deps = [ | 19 deps = [ |
19 "//blimp/common", | 20 "//blimp/common", |
20 "//net", | 21 "//net", |
21 ] | 22 ] |
22 | 23 |
23 public_deps = [ | 24 public_deps = [ |
(...skipping 22 matching lines...) Expand all Loading... |
46 java_files = [ | 47 java_files = [ |
47 "../android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreference
s.java", | 48 "../android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreference
s.java", |
48 "../android/java/src/org/chromium/blimp/core/settings/BlimpPreferencesDele
gate.java", | 49 "../android/java/src/org/chromium/blimp/core/settings/BlimpPreferencesDele
gate.java", |
49 ] | 50 ] |
50 | 51 |
51 # TODO(xingliu): Clean resources files in the future. http://crbug.com/63068
7. | 52 # TODO(xingliu): Clean resources files in the future. http://crbug.com/63068
7. |
52 deps = [ | 53 deps = [ |
53 "//base:base_java", | 54 "//base:base_java", |
54 "//blimp/client:blimp_java_resources", | 55 "//blimp/client:blimp_java_resources", |
55 "//blimp/client/core:common_java", | 56 "//blimp/client/core:common_java", |
| 57 "//blimp/client/core/session:session_java", |
56 "//blimp/client/public:public_headers_java", | 58 "//blimp/client/public:public_headers_java", |
57 "//components/sync/android:sync_java", | 59 "//components/sync/android:sync_java", |
58 "//third_party/android_tools:android_support_v7_appcompat_java", | 60 "//third_party/android_tools:android_support_v7_appcompat_java", |
59 ] | 61 ] |
60 } | 62 } |
61 | 63 |
62 generate_jni("settings_jni_headers") { | 64 generate_jni("settings_jni_headers") { |
63 visibility = [ ":*" ] | 65 visibility = [ ":*" ] |
64 | 66 |
65 sources = [ | 67 sources = [ |
66 "../android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreference
s.java", | 68 "../android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreference
s.java", |
67 ] | 69 ] |
68 | 70 |
69 jni_package = "blimp/client/core/settings" | 71 jni_package = "blimp/client/core/settings" |
70 } | 72 } |
71 } | 73 } |
OLD | NEW |