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 import("//blimp/blimp.gni") | |
6 | |
5 if (is_android) { | 7 if (is_android) { |
6 import("//build/config/android/config.gni") | 8 import("//build/config/android/config.gni") |
7 import("//build/config/android/rules.gni") | 9 import("//build/config/android/rules.gni") |
8 } | 10 } |
9 | 11 |
10 source_set("core") { | 12 source_set("core") { |
Dirk Pranke
2016/07/14 23:25:51
It seems like it might make more sense to move all
nyquist
2016/07/15 17:38:19
All done! Thanks for your help!
| |
11 visibility = [ "//blimp/*" ] | 13 visibility = [ "//blimp/client/*" ] |
14 | |
15 if (enable_blimp) { | |
16 visibility += [ "//chrome/browser" ] | |
17 } | |
12 | 18 |
13 sources = [ | 19 sources = [ |
20 "blimp_client_context_impl.cc", | |
21 "blimp_client_context_impl.h", | |
14 "blimp_contents_impl.cc", | 22 "blimp_contents_impl.cc", |
15 "blimp_contents_impl.h", | 23 "blimp_contents_impl.h", |
16 "blimp_navigation_controller_delegate.h", | 24 "blimp_navigation_controller_delegate.h", |
17 "blimp_navigation_controller_impl.cc", | 25 "blimp_navigation_controller_impl.cc", |
18 "blimp_navigation_controller_impl.h", | 26 "blimp_navigation_controller_impl.h", |
19 ] | 27 ] |
20 | 28 |
21 deps = [ | 29 deps = [ |
22 "//base", | 30 "//base", |
23 "//blimp/client/public", | 31 "//blimp/client/public", |
24 "//url", | 32 "//url", |
25 ] | 33 ] |
26 | 34 |
27 if (is_android) { | 35 if (is_android) { |
28 sources += [ | 36 sources += [ |
37 "android/blimp_client_context_impl_android.cc", | |
38 "android/blimp_client_context_impl_android.h", | |
29 "android/blimp_contents_factory.cc", | 39 "android/blimp_contents_factory.cc", |
30 "android/blimp_contents_factory.h", | 40 "android/blimp_contents_factory.h", |
31 "android/blimp_contents_impl_android.cc", | 41 "android/blimp_contents_impl_android.cc", |
32 "android/blimp_contents_impl_android.h", | 42 "android/blimp_contents_impl_android.h", |
33 "android/blimp_contents_observer_proxy.cc", | 43 "android/blimp_contents_observer_proxy.cc", |
34 "android/blimp_contents_observer_proxy.h", | 44 "android/blimp_contents_observer_proxy.h", |
45 "android/blimp_jni_registrar.cc", | |
35 "android/blimp_navigation_controller_impl_android.cc", | 46 "android/blimp_navigation_controller_impl_android.cc", |
36 "android/blimp_navigation_controller_impl_android.h", | 47 "android/blimp_navigation_controller_impl_android.h", |
37 ] | 48 ] |
38 | 49 |
39 deps += [ "//blimp/client/core:core_jni_headers" ] | 50 deps += [ ":core_jni_headers" ] |
40 } | 51 } |
41 } | 52 } |
42 | 53 |
43 source_set("unit_tests") { | 54 source_set("unit_tests") { |
44 testonly = true | 55 testonly = true |
45 | 56 |
46 sources = [ | 57 sources = [ |
58 "blimp_client_context_impl_unittest.cc", | |
47 "blimp_contents_impl_unittest.cc", | 59 "blimp_contents_impl_unittest.cc", |
48 "blimp_navigation_controller_impl_unittest.cc", | 60 "blimp_navigation_controller_impl_unittest.cc", |
49 ] | 61 ] |
50 | 62 |
51 deps = [ | 63 deps = [ |
52 "//base", | 64 "//base", |
53 "//blimp/client/core", | 65 "//blimp/client/core", |
54 "//blimp/client/public", | 66 "//blimp/client/public", |
67 "//blimp/client/test", | |
55 "//testing/gtest", | 68 "//testing/gtest", |
56 "//url", | 69 "//url", |
57 ] | 70 ] |
58 } | 71 } |
59 | 72 |
60 if (is_android) { | 73 if (is_android) { |
61 android_library("core_java") { | 74 android_library("core_java") { |
62 visibility = [ "//blimp/*" ] | 75 visibility = [ "//blimp/client/*" ] |
76 | |
77 if (enable_blimp) { | |
78 visibility += [ "//chrome/android/*" ] | |
79 } | |
63 | 80 |
64 java_files = [ | 81 java_files = [ |
82 "android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java", | |
65 "android/java/src/org/chromium/blimp/core/BlimpContentsFactory.java", | 83 "android/java/src/org/chromium/blimp/core/BlimpContentsFactory.java", |
66 "android/java/src/org/chromium/blimp/core/BlimpContentsImpl.java", | 84 "android/java/src/org/chromium/blimp/core/BlimpContentsImpl.java", |
67 "android/java/src/org/chromium/blimp/core/BlimpContentsObserverProxy.java" , | 85 "android/java/src/org/chromium/blimp/core/BlimpContentsObserverProxy.java" , |
68 "android/java/src/org/chromium/blimp/core/BlimpNavigationControllerImpl.ja va", | 86 "android/java/src/org/chromium/blimp/core/BlimpNavigationControllerImpl.ja va", |
69 ] | 87 ] |
70 | 88 |
71 deps = [ | 89 deps = [ |
72 "//base:base_java", | 90 "//base:base_java", |
73 "//blimp/client/public:public_java", | 91 "//blimp/client/public:public_java", |
74 ] | 92 ] |
75 } | 93 } |
76 | 94 |
77 generate_jni("core_jni_headers") { | 95 generate_jni("core_jni_headers") { |
78 sources = [ | 96 sources = [ |
97 "android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java", | |
79 "android/java/src/org/chromium/blimp/core/BlimpContentsFactory.java", | 98 "android/java/src/org/chromium/blimp/core/BlimpContentsFactory.java", |
80 "android/java/src/org/chromium/blimp/core/BlimpContentsImpl.java", | 99 "android/java/src/org/chromium/blimp/core/BlimpContentsImpl.java", |
81 "android/java/src/org/chromium/blimp/core/BlimpContentsObserverProxy.java" , | 100 "android/java/src/org/chromium/blimp/core/BlimpContentsObserverProxy.java" , |
82 "android/java/src/org/chromium/blimp/core/BlimpNavigationControllerImpl.ja va", | 101 "android/java/src/org/chromium/blimp/core/BlimpNavigationControllerImpl.ja va", |
83 ] | 102 ] |
84 | 103 |
85 jni_package = "blimp" | 104 jni_package = "blimp/client/core" |
86 } | 105 } |
87 } | 106 } |
OLD | NEW |