| 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") { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 public_deps = [ | 34 public_deps = [ |
| 35 "//base", | 35 "//base", |
| 36 "//blimp/net", | 36 "//blimp/net", |
| 37 ] | 37 ] |
| 38 | 38 |
| 39 if (is_android) { | 39 if (is_android) { |
| 40 sources += [ | 40 sources += [ |
| 41 "android/blimp_settings_android.cc", | 41 "android/blimp_settings_android.cc", |
| 42 "android/blimp_settings_android.h", | 42 "android/blimp_settings_android.h", |
| 43 "android/settings_android.cc", |
| 44 "android/settings_android.h", |
| 45 "android/settings_observer_proxy.cc", |
| 46 "android/settings_observer_proxy.h", |
| 43 ] | 47 ] |
| 44 | 48 |
| 45 deps += [ | 49 deps += [ |
| 46 ":settings_jni_headers", | 50 ":settings_jni_headers", |
| 47 "//blimp/client/core/session", | 51 "//blimp/client/core/session", |
| 48 "//blimp/common", | 52 "//blimp/common", |
| 49 ] | 53 ] |
| 50 } | 54 } |
| 51 } | 55 } |
| 52 | 56 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 72 if (is_android) { | 76 if (is_android) { |
| 73 android_library("settings_java") { | 77 android_library("settings_java") { |
| 74 visibility = [ | 78 visibility = [ |
| 75 "//blimp/client/app:*", # TODO(nyquist): Remove this. See crbug/651964. | 79 "//blimp/client/app:*", # TODO(nyquist): Remove this. See crbug/651964. |
| 76 "//blimp/client/core/*", | 80 "//blimp/client/core/*", |
| 77 ] | 81 ] |
| 78 | 82 |
| 79 java_files = [ | 83 java_files = [ |
| 80 "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.j
ava", | 84 "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.j
ava", |
| 81 "android/java/src/org/chromium/blimp/core/settings/BlimpPreferencesDelegat
e.java", | 85 "android/java/src/org/chromium/blimp/core/settings/BlimpPreferencesDelegat
e.java", |
| 86 "android/java/src/org/chromium/blimp/core/settings/EmptySettingsObserver.j
ava", |
| 87 "android/java/src/org/chromium/blimp/core/settings/Settings.java", |
| 88 "android/java/src/org/chromium/blimp/core/settings/SettingsObserver.java", |
| 89 "android/java/src/org/chromium/blimp/core/settings/SettingsObserverProxy.j
ava", |
| 82 ] | 90 ] |
| 83 | 91 |
| 84 # TODO(xingliu): Clean resources files in the future. http://crbug.com/63068
7. | 92 # TODO(xingliu): Clean resources files in the future. http://crbug.com/63068
7. |
| 85 deps = [ | 93 deps = [ |
| 86 "//base:base_java", | 94 "//base:base_java", |
| 87 "//blimp/client/app:blimp_java_resources", | 95 "//blimp/client/app:blimp_java_resources", |
| 88 "//blimp/client/core/common:common_java", | 96 "//blimp/client/core/common:common_java", |
| 89 "//blimp/client/public:public_headers_java", | 97 "//blimp/client/public:public_headers_java", |
| 90 "//components/signin/core/browser/android:java", | 98 "//components/signin/core/browser/android:java", |
| 91 "//components/sync/android:sync_java", | 99 "//components/sync/android:sync_java", |
| 92 "//third_party/android_tools:android_support_v7_appcompat_java", | 100 "//third_party/android_tools:android_support_v7_appcompat_java", |
| 93 ] | 101 ] |
| 94 } | 102 } |
| 95 | 103 |
| 96 generate_jni("settings_jni_headers") { | 104 generate_jni("settings_jni_headers") { |
| 97 visibility = [ ":*" ] | 105 visibility = [ ":*" ] |
| 98 | 106 |
| 99 sources = [ | 107 sources = [ |
| 100 "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.j
ava", | 108 "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.j
ava", |
| 109 "android/java/src/org/chromium/blimp/core/settings/Settings.java", |
| 110 "android/java/src/org/chromium/blimp/core/settings/SettingsObserverProxy.j
ava", |
| 101 ] | 111 ] |
| 102 | 112 |
| 103 jni_package = "blimp/client/core/settings" | 113 jni_package = "blimp/client/core/settings" |
| 104 } | 114 } |
| 105 } | 115 } |
| OLD | NEW |