| 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("contents") { | 10 source_set("contents") { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 "tab_control_feature.h", | 27 "tab_control_feature.h", |
| 28 ] | 28 ] |
| 29 | 29 |
| 30 public_deps = [ | 30 public_deps = [ |
| 31 "//base", | 31 "//base", |
| 32 "//blimp/client/core/compositor", | 32 "//blimp/client/core/compositor", |
| 33 "//blimp/client/public:public_headers", | 33 "//blimp/client/public:public_headers", |
| 34 "//blimp/net", | 34 "//blimp/net", |
| 35 "//net:net", | 35 "//net:net", |
| 36 "//ui/base/ime:text_input_types", | 36 "//ui/base/ime:text_input_types", |
| 37 "//ui/gfx:native_widget_types", |
| 37 "//ui/gfx/geometry:geometry", | 38 "//ui/gfx/geometry:geometry", |
| 38 "//url", | 39 "//url", |
| 39 ] | 40 ] |
| 40 | 41 |
| 41 deps = [ | 42 deps = [ |
| 42 "//blimp/client/core/render_widget", | 43 "//blimp/client/core/render_widget", |
| 43 "//blimp/common", | 44 "//blimp/common", |
| 44 "//components/url_formatter", | 45 "//components/url_formatter", |
| 45 "//skia", | 46 "//skia", |
| 46 ] | 47 ] |
| 47 | 48 |
| 48 if (is_android) { | 49 if (is_android) { |
| 49 sources += [ | 50 sources += [ |
| 50 "android/blimp_contents_impl_android.cc", | 51 "android/blimp_contents_impl_android.cc", |
| 51 "android/blimp_contents_impl_android.h", | 52 "android/blimp_contents_impl_android.h", |
| 52 "android/blimp_contents_jni_registrar.cc", | 53 "android/blimp_contents_jni_registrar.cc", |
| 53 "android/blimp_contents_jni_registrar.h", | 54 "android/blimp_contents_jni_registrar.h", |
| 54 "android/blimp_contents_observer_proxy.cc", | 55 "android/blimp_contents_observer_proxy.cc", |
| 55 "android/blimp_contents_observer_proxy.h", | 56 "android/blimp_contents_observer_proxy.h", |
| 56 "android/blimp_navigation_controller_impl_android.cc", | 57 "android/blimp_navigation_controller_impl_android.cc", |
| 57 "android/blimp_navigation_controller_impl_android.h", | 58 "android/blimp_navigation_controller_impl_android.h", |
| 59 "android/blimp_view.cc", |
| 60 "android/blimp_view.h", |
| 58 "blimp_contents_view_android.cc", | 61 "blimp_contents_view_android.cc", |
| 59 "blimp_contents_view_android.h", | 62 "blimp_contents_view_android.h", |
| 60 ] | 63 ] |
| 61 | 64 |
| 65 public_deps += [ "//ui/android" ] |
| 66 |
| 62 deps += [ | 67 deps += [ |
| 63 ":jni_headers", | 68 ":jni_headers", |
| 64 "//cc", | 69 "//cc", |
| 65 "//ui/android", | 70 "//ui/android", |
| 71 "//ui/events:events", |
| 66 ] | 72 ] |
| 67 } else { | 73 } else { |
| 68 sources += [ | 74 sources += [ |
| 69 "blimp_contents_view_aura.cc", | 75 "blimp_contents_view_aura.cc", |
| 70 "blimp_contents_view_aura.h", | 76 "blimp_contents_view_aura.h", |
| 71 ] | 77 ] |
| 72 } | 78 } |
| 73 } | 79 } |
| 74 | 80 |
| 75 source_set("test_support") { | 81 source_set("test_support") { |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 ":contents", | 120 ":contents", |
| 115 ":test_support", | 121 ":test_support", |
| 116 "//base", | 122 "//base", |
| 117 "//blimp/client/public:public_headers", | 123 "//blimp/client/public:public_headers", |
| 118 "//blimp/client/support:test_support", | 124 "//blimp/client/support:test_support", |
| 119 "//blimp/common", | 125 "//blimp/common", |
| 120 "//blimp/net:test_support", | 126 "//blimp/net:test_support", |
| 121 "//net", | 127 "//net", |
| 122 "//net:test_support", | 128 "//net:test_support", |
| 123 "//testing/gtest", | 129 "//testing/gtest", |
| 130 "//ui/gfx:native_widget_types", |
| 124 "//ui/gfx:test_support", | 131 "//ui/gfx:test_support", |
| 125 "//ui/gfx/geometry:geometry", | 132 "//ui/gfx/geometry:geometry", |
| 126 "//url", | 133 "//url", |
| 127 ] | 134 ] |
| 135 |
| 136 if (is_android) { |
| 137 deps += [ "//ui/android" ] |
| 138 } |
| 128 } | 139 } |
| 129 | 140 |
| 130 if (is_android) { | 141 if (is_android) { |
| 131 android_library("contents_java") { | 142 android_library("contents_java") { |
| 132 visibility = [ "//blimp/client/*" ] | 143 visibility = [ "//blimp/client/*" ] |
| 133 | 144 |
| 134 java_files = [ | 145 java_files = [ |
| 135 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java"
, | 146 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java"
, |
| 136 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverPr
oxy.java", | 147 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverPr
oxy.java", |
| 137 "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControll
erImpl.java", | 148 "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControll
erImpl.java", |
| 149 "android/java/src/org/chromium/blimp/core/contents/BlimpView.java", |
| 138 ] | 150 ] |
| 139 | 151 |
| 140 deps = [ | 152 deps = [ |
| 141 "//base:base_java", | 153 "//base:base_java", |
| 142 "//blimp/client/public:public_headers_java", | 154 "//blimp/client/public:public_headers_java", |
| 155 "//ui/android:ui_java", |
| 143 ] | 156 ] |
| 144 } | 157 } |
| 145 | 158 |
| 146 generate_jni("jni_headers") { | 159 generate_jni("jni_headers") { |
| 147 visibility = [ ":*" ] | 160 visibility = [ ":*" ] |
| 148 | 161 |
| 149 sources = [ | 162 sources = [ |
| 150 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java"
, | 163 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java"
, |
| 151 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverPr
oxy.java", | 164 "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverPr
oxy.java", |
| 152 "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControll
erImpl.java", | 165 "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControll
erImpl.java", |
| 166 "android/java/src/org/chromium/blimp/core/contents/BlimpView.java", |
| 153 ] | 167 ] |
| 154 | 168 |
| 155 jni_package = "blimp/client/core/contents" | 169 jni_package = "blimp/client/core/contents" |
| 156 } | 170 } |
| 157 } | 171 } |
| OLD | NEW |