| 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 declare_args() { | 10 declare_args() { |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 sources = [ | 91 sources = [ |
| 92 "blimp_client_context_impl.cc", | 92 "blimp_client_context_impl.cc", |
| 93 "blimp_client_context_impl.h", | 93 "blimp_client_context_impl.h", |
| 94 ] | 94 ] |
| 95 | 95 |
| 96 public_deps = [ | 96 public_deps = [ |
| 97 "//base", | 97 "//base", |
| 98 "//blimp/client/core/contents", | 98 "//blimp/client/core/contents", |
| 99 "//blimp/client/core/session", | 99 "//blimp/client/core/session", |
| 100 "//blimp/client/public:public_headers", | 100 "//blimp/client/public:public_headers", |
| 101 "//url", |
| 101 ] | 102 ] |
| 102 | 103 |
| 103 if (is_android) { | 104 if (is_android) { |
| 104 sources += [ | 105 sources += [ |
| 105 "android/blimp_client_context_impl_android.cc", | 106 "android/blimp_client_context_impl_android.cc", |
| 106 "android/blimp_client_context_impl_android.h", | 107 "android/blimp_client_context_impl_android.h", |
| 107 "android/blimp_jni_registrar.cc", | 108 "android/blimp_jni_registrar.cc", |
| 108 ] | 109 ] |
| 109 | 110 |
| 110 deps = [ | 111 deps = [ |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 android_library("switches_java") { | 183 android_library("switches_java") { |
| 183 visibility = [ "//blimp/client/*" ] | 184 visibility = [ "//blimp/client/*" ] |
| 184 | 185 |
| 185 java_files = | 186 java_files = |
| 186 [ "android/java/src/org/chromium/blimp/core/BlimpClientSwitches.java" ] | 187 [ "android/java/src/org/chromium/blimp/core/BlimpClientSwitches.java" ] |
| 187 } | 188 } |
| 188 | 189 |
| 189 android_library("settings_java") { | 190 android_library("settings_java") { |
| 190 visibility = [ "//blimp/client/*" ] | 191 visibility = [ "//blimp/client/*" ] |
| 191 | 192 |
| 192 java_files = [ "android/java/src/org/chromium/blimp/core/settings/AboutBlimp
Preferences.java" ] | 193 java_files = [ |
| 194 "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.j
ava", |
| 195 "android/java/src/org/chromium/blimp/core/settings/PreferencesUtil.java", |
| 196 ] |
| 193 | 197 |
| 194 # TODO(xingliu): Remove android support v7 dependency and move android resou
rces to Chrome | 198 # TODO(xingliu): Remove android support v7 dependency and move android resou
rces to Chrome |
| 195 # after Blimp merge to Chrome. | 199 # after Blimp merge to Chrome. |
| 196 deps = [ | 200 deps = [ |
| 197 "//base:base_java", | 201 "//base:base_java", |
| 198 "//blimp/client:blimp_java_resources", | 202 "//blimp/client:blimp_java_resources", |
| 199 "//blimp/client/public:public_headers_java", | 203 "//blimp/client/public:public_headers_java", |
| 200 "//third_party/android_tools:android_support_v7_appcompat_java", | 204 "//third_party/android_tools:android_support_v7_appcompat_java", |
| 201 ] | 205 ] |
| 202 } | 206 } |
| (...skipping 11 matching lines...) Expand all Loading... |
| 214 generate_jni("dummy_core_jni_headers") { | 218 generate_jni("dummy_core_jni_headers") { |
| 215 visibility = [ ":*" ] | 219 visibility = [ ":*" ] |
| 216 | 220 |
| 217 sources = [ | 221 sources = [ |
| 218 "android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java", | 222 "android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java", |
| 219 ] | 223 ] |
| 220 | 224 |
| 221 jni_package = "blimp/client/core" | 225 jni_package = "blimp/client/core" |
| 222 } | 226 } |
| 223 } | 227 } |
| OLD | NEW |