| 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  113   if (is_android) { |  113   if (is_android) { | 
|  114     sources += [ |  114     sources += [ | 
|  115       "android/blimp_client_context_impl_android.cc", |  115       "android/blimp_client_context_impl_android.cc", | 
|  116       "android/blimp_client_context_impl_android.h", |  116       "android/blimp_client_context_impl_android.h", | 
|  117       "android/blimp_jni_registrar.cc", |  117       "android/blimp_jni_registrar.cc", | 
|  118     ] |  118     ] | 
|  119  |  119  | 
|  120     deps += [ |  120     deps += [ | 
|  121       ":context_jni_headers", |  121       ":context_jni_headers", | 
|  122       "//blimp/client/core/settings", |  122       "//blimp/client/core/settings", | 
 |  123       "//ui/android", | 
|  123     ] |  124     ] | 
|  124   } |  125   } | 
|  125 } |  126 } | 
|  126  |  127  | 
|  127 source_set("switches") { |  128 source_set("switches") { | 
|  128   visibility = [ |  129   visibility = [ | 
|  129     "//blimp/client/*", |  130     "//blimp/client/*", | 
|  130     "//blimp/engine:browser_tests", |  131     "//blimp/engine:browser_tests", | 
|  131   ] |  132   ] | 
|  132  |  133  | 
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  170   } |  171   } | 
|  171  |  172  | 
|  172   android_library("dummy_core_java") { |  173   android_library("dummy_core_java") { | 
|  173     visibility = [ ":*" ] |  174     visibility = [ ":*" ] | 
|  174  |  175  | 
|  175     java_files = [ "android/java/src/org/chromium/blimp/core/DummyBlimpClientCon
     text.java" ] |  176     java_files = [ "android/java/src/org/chromium/blimp/core/DummyBlimpClientCon
     text.java" ] | 
|  176  |  177  | 
|  177     deps = [ |  178     deps = [ | 
|  178       "//base:base_java", |  179       "//base:base_java", | 
|  179       "//blimp/client/public:public_headers_java", |  180       "//blimp/client/public:public_headers_java", | 
 |  181       "//ui/android:ui_java", | 
|  180     ] |  182     ] | 
|  181   } |  183   } | 
|  182  |  184  | 
|  183   android_library("context_java") { |  185   android_library("context_java") { | 
|  184     visibility = [ "//blimp/client/*" ] |  186     visibility = [ "//blimp/client/*" ] | 
|  185  |  187  | 
|  186     java_files = [ "android/java/src/org/chromium/blimp/core/BlimpClientContextI
     mpl.java" ] |  188     java_files = [ "android/java/src/org/chromium/blimp/core/BlimpClientContextI
     mpl.java" ] | 
|  187  |  189  | 
|  188     deps = [ |  190     deps = [ | 
|  189       ":common_java", |  191       ":common_java", | 
|  190       ":switches_java", |  192       ":switches_java", | 
|  191       "//base:base_java", |  193       "//base:base_java", | 
|  192       "//blimp/client/core/contents:contents_java", |  194       "//blimp/client/core/contents:contents_java", | 
|  193       "//blimp/client/core/settings:settings_java", |  195       "//blimp/client/core/settings:settings_java", | 
|  194       "//blimp/client/public:public_headers_java", |  196       "//blimp/client/public:public_headers_java", | 
 |  197       "//ui/android:ui_java", | 
|  195     ] |  198     ] | 
|  196   } |  199   } | 
|  197  |  200  | 
|  198   android_library("common_java") { |  201   android_library("common_java") { | 
|  199     visibility = [ "//blimp/client/*" ] |  202     visibility = [ "//blimp/client/*" ] | 
|  200  |  203  | 
|  201     java_files = [ "android/java/src/org/chromium/blimp/core/settings/Preference
     sUtil.java" ] |  204     java_files = [ "android/java/src/org/chromium/blimp/core/settings/Preference
     sUtil.java" ] | 
|  202  |  205  | 
|  203     deps = [ |  206     deps = [ | 
|  204       "//base:base_java", |  207       "//base:base_java", | 
| (...skipping 21 matching lines...) Expand all  Loading... | 
|  226   generate_jni("dummy_core_jni_headers") { |  229   generate_jni("dummy_core_jni_headers") { | 
|  227     visibility = [ ":*" ] |  230     visibility = [ ":*" ] | 
|  228  |  231  | 
|  229     sources = [ |  232     sources = [ | 
|  230       "android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java", |  233       "android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java", | 
|  231     ] |  234     ] | 
|  232  |  235  | 
|  233     jni_package = "blimp/client/core" |  236     jni_package = "blimp/client/core" | 
|  234   } |  237   } | 
|  235 } |  238 } | 
| OLD | NEW |