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