| 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 source_set("settings") { | 10 source_set("settings") { |
| 10 visibility = [ "//blimp/client/*" ] | 11 visibility = [ "//blimp/client/*" ] |
| 11 | 12 |
| 12 sources = [ | 13 sources = [ |
| 14 "settings_feature.cc", |
| 15 "settings_feature.h", |
| 16 ] |
| 17 |
| 18 deps = [ |
| 19 "//blimp/common", |
| 20 "//net", |
| 21 ] |
| 22 |
| 23 public_deps = [ |
| 24 "//base", |
| 25 "//blimp/net", |
| 26 ] |
| 27 |
| 28 if (is_android) { |
| 29 sources += [ |
| 13 "android/blimp_settings_android.cc", | 30 "android/blimp_settings_android.cc", |
| 14 "android/blimp_settings_android.h", | 31 "android/blimp_settings_android.h", |
| 15 ] | 32 ] |
| 16 | 33 |
| 17 deps = [ | 34 deps += [ |
| 18 ":settings_jni_headers", | 35 ":settings_jni_headers", |
| 19 "//blimp/client/core/session", | 36 "//blimp/client/core/session", |
| 20 "//blimp/common", | 37 "//blimp/common", |
| 21 ] | 38 ] |
| 22 } | 39 } |
| 40 } |
| 23 | 41 |
| 42 if (is_android) { |
| 24 android_library("settings_java") { | 43 android_library("settings_java") { |
| 25 visibility = [ "//blimp/client/*" ] | 44 visibility = [ "//blimp/client/*" ] |
| 26 | 45 |
| 27 java_files = [ | 46 java_files = [ |
| 28 "../android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreference
s.java", | 47 "../android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreference
s.java", |
| 29 "../android/java/src/org/chromium/blimp/core/settings/BlimpPreferencesDele
gate.java", | 48 "../android/java/src/org/chromium/blimp/core/settings/BlimpPreferencesDele
gate.java", |
| 30 ] | 49 ] |
| 31 | 50 |
| 32 # TODO(xingliu): Clean resources files in the future. http://crbug.com/63068
7. | 51 # TODO(xingliu): Clean resources files in the future. http://crbug.com/63068
7. |
| 33 deps = [ | 52 deps = [ |
| 34 "//base:base_java", | 53 "//base:base_java", |
| 35 "//blimp/client:blimp_java_resources", | 54 "//blimp/client:blimp_java_resources", |
| 36 "//blimp/client/core:common_java", | 55 "//blimp/client/core:common_java", |
| 37 "//blimp/client/public:public_headers_java", | 56 "//blimp/client/public:public_headers_java", |
| 38 "//components/sync/android:sync_java", | 57 "//components/sync/android:sync_java", |
| 39 "//third_party/android_tools:android_support_v7_appcompat_java", | 58 "//third_party/android_tools:android_support_v7_appcompat_java", |
| 40 ] | 59 ] |
| 41 } | 60 } |
| 42 | 61 |
| 43 generate_jni("settings_jni_headers") { | 62 generate_jni("settings_jni_headers") { |
| 44 visibility = [ ":*" ] | 63 visibility = [ ":*" ] |
| 45 | 64 |
| 46 sources = [ | 65 sources = [ |
| 47 "../android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreference
s.java", | 66 "../android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreference
s.java", |
| 48 ] | 67 ] |
| 49 | 68 |
| 50 jni_package = "blimp/client/core/settings" | 69 jni_package = "blimp/client/core/settings" |
| 51 } | 70 } |
| 52 } | 71 } |
| OLD | NEW |