| 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 = [ | 11 visibility = [ |
| 12 "//blimp/client/app:*", # TODO(nyquist): Remove this. See crbug/651964. | 12 "//blimp/client/app:*", # TODO(nyquist): Remove this. See crbug/651964. |
| 13 "//blimp/client/core/*", | 13 "//blimp/client/core/*", |
| 14 ] | 14 ] |
| 15 | 15 |
| 16 sources = [ | 16 sources = [ |
| 17 "blimp_settings_delegate.h", | 17 "blimp_settings_delegate.h", |
| 18 "settings.cc", |
| 19 "settings.h", |
| 18 "settings_feature.cc", | 20 "settings_feature.cc", |
| 19 "settings_feature.h", | 21 "settings_feature.h", |
| 22 "settings_observer.h", |
| 23 "settings_prefs.cc", |
| 24 "settings_prefs.h", |
| 20 ] | 25 ] |
| 21 | 26 |
| 22 deps = [ | 27 deps = [ |
| 28 "//blimp/client/core/switches", |
| 23 "//blimp/common", | 29 "//blimp/common", |
| 30 "//components/prefs", |
| 24 "//net", | 31 "//net", |
| 25 ] | 32 ] |
| 26 | 33 |
| 27 public_deps = [ | 34 public_deps = [ |
| 28 "//base", | 35 "//base", |
| 29 "//blimp/net", | 36 "//blimp/net", |
| 30 ] | 37 ] |
| 31 | 38 |
| 32 if (is_android) { | 39 if (is_android) { |
| 33 sources += [ | 40 sources += [ |
| 34 "android/blimp_settings_android.cc", | 41 "android/blimp_settings_android.cc", |
| 35 "android/blimp_settings_android.h", | 42 "android/blimp_settings_android.h", |
| 36 ] | 43 ] |
| 37 | 44 |
| 38 deps += [ | 45 deps += [ |
| 39 ":settings_jni_headers", | 46 ":settings_jni_headers", |
| 40 "//blimp/client/core/session", | 47 "//blimp/client/core/session", |
| 41 "//blimp/common", | 48 "//blimp/common", |
| 42 ] | 49 ] |
| 43 } | 50 } |
| 44 } | 51 } |
| 45 | 52 |
| 53 source_set("unit_tests") { |
| 54 visibility = [ "//blimp/client/core:unit_tests" ] |
| 55 |
| 56 testonly = true |
| 57 |
| 58 sources = [ |
| 59 "settings_unittest.cc", |
| 60 ] |
| 61 |
| 62 deps = [ |
| 63 ":settings", |
| 64 "//base", |
| 65 "//blimp/client/core/switches:switches", |
| 66 "//components/prefs:test_support", |
| 67 "//testing/gmock", |
| 68 "//testing/gtest", |
| 69 ] |
| 70 } |
| 71 |
| 46 if (is_android) { | 72 if (is_android) { |
| 47 android_library("settings_java") { | 73 android_library("settings_java") { |
| 48 visibility = [ | 74 visibility = [ |
| 49 "//blimp/client/app:*", # TODO(nyquist): Remove this. See crbug/651964. | 75 "//blimp/client/app:*", # TODO(nyquist): Remove this. See crbug/651964. |
| 50 "//blimp/client/core/*", | 76 "//blimp/client/core/*", |
| 51 ] | 77 ] |
| 52 | 78 |
| 53 java_files = [ | 79 java_files = [ |
| 54 "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.j
ava", | 80 "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.j
ava", |
| 55 "android/java/src/org/chromium/blimp/core/settings/BlimpPreferencesDelegat
e.java", | 81 "android/java/src/org/chromium/blimp/core/settings/BlimpPreferencesDelegat
e.java", |
| (...skipping 14 matching lines...) Expand all Loading... |
| 70 generate_jni("settings_jni_headers") { | 96 generate_jni("settings_jni_headers") { |
| 71 visibility = [ ":*" ] | 97 visibility = [ ":*" ] |
| 72 | 98 |
| 73 sources = [ | 99 sources = [ |
| 74 "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.j
ava", | 100 "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.j
ava", |
| 75 ] | 101 ] |
| 76 | 102 |
| 77 jni_package = "blimp/client/core/settings" | 103 jni_package = "blimp/client/core/settings" |
| 78 } | 104 } |
| 79 } | 105 } |
| OLD | NEW |