| 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 import("//blimp/client/core/config.gni") | 10 import("//blimp/client/core/config.gni") |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 sources = [ | 86 sources = [ |
| 87 "blimp_client_context_impl.cc", | 87 "blimp_client_context_impl.cc", |
| 88 "blimp_client_context_impl.h", | 88 "blimp_client_context_impl.h", |
| 89 ] | 89 ] |
| 90 | 90 |
| 91 public_deps = [ | 91 public_deps = [ |
| 92 "//base", | 92 "//base", |
| 93 "//blimp/client/core/contents", | 93 "//blimp/client/core/contents", |
| 94 "//blimp/client/core/session", | 94 "//blimp/client/core/session", |
| 95 "//blimp/client/public:public_headers", | 95 "//blimp/client/public:public_headers", |
| 96 "//url", |
| 96 ] | 97 ] |
| 97 | 98 |
| 98 if (is_android) { | 99 if (is_android) { |
| 99 sources += [ | 100 sources += [ |
| 100 "android/blimp_client_context_impl_android.cc", | 101 "android/blimp_client_context_impl_android.cc", |
| 101 "android/blimp_client_context_impl_android.h", | 102 "android/blimp_client_context_impl_android.h", |
| 102 "android/blimp_jni_registrar.cc", | 103 "android/blimp_jni_registrar.cc", |
| 103 ] | 104 ] |
| 104 | 105 |
| 105 deps = [ | 106 deps = [ |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 android_library("switches_java") { | 178 android_library("switches_java") { |
| 178 visibility = [ "//blimp/client/*" ] | 179 visibility = [ "//blimp/client/*" ] |
| 179 | 180 |
| 180 java_files = | 181 java_files = |
| 181 [ "android/java/src/org/chromium/blimp/core/BlimpClientSwitches.java" ] | 182 [ "android/java/src/org/chromium/blimp/core/BlimpClientSwitches.java" ] |
| 182 } | 183 } |
| 183 | 184 |
| 184 android_library("settings_java") { | 185 android_library("settings_java") { |
| 185 visibility = [ "//blimp/client/*" ] | 186 visibility = [ "//blimp/client/*" ] |
| 186 | 187 |
| 187 java_files = [ "android/java/src/org/chromium/blimp/core/settings/AboutBlimp
Preferences.java" ] | 188 java_files = [ |
| 189 "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.j
ava", |
| 190 "android/java/src/org/chromium/blimp/core/settings/PreferencesUtil.java", |
| 191 ] |
| 188 | 192 |
| 189 # TODO(xingliu): Remove android support v7 dependency and move android resou
rces to Chrome | 193 # TODO(xingliu): Remove android support v7 dependency and move android resou
rces to Chrome |
| 190 # after Blimp merge to Chrome. | 194 # after Blimp merge to Chrome. |
| 191 deps = [ | 195 deps = [ |
| 192 "//base:base_java", | 196 "//base:base_java", |
| 193 "//blimp/client:blimp_java_resources", | 197 "//blimp/client:blimp_java_resources", |
| 194 "//blimp/client/public:public_headers_java", | 198 "//blimp/client/public:public_headers_java", |
| 195 "//third_party/android_tools:android_support_v7_appcompat_java", | 199 "//third_party/android_tools:android_support_v7_appcompat_java", |
| 196 ] | 200 ] |
| 197 } | 201 } |
| (...skipping 11 matching lines...) Expand all Loading... |
| 209 generate_jni("dummy_core_jni_headers") { | 213 generate_jni("dummy_core_jni_headers") { |
| 210 visibility = [ ":*" ] | 214 visibility = [ ":*" ] |
| 211 | 215 |
| 212 sources = [ | 216 sources = [ |
| 213 "android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java", | 217 "android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java", |
| 214 ] | 218 ] |
| 215 | 219 |
| 216 jni_package = "blimp/client/core" | 220 jni_package = "blimp/client/core" |
| 217 } | 221 } |
| 218 } | 222 } |
| OLD | NEW |