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("public") { | 10 # Only //chrome should ever depend on this. Code in //blimp/client/* should |
11 # instead use //blimp/client/public:public_headers directly. | |
Dirk Pranke
2016/07/15 18:31:21
I might add something like "This target differs fr
nyquist
2016/07/15 19:03:54
Done.
| |
12 group("public") { | |
13 visibility = [ "//chrome/*" ] | |
14 | |
15 deps = [ | |
16 ":public_headers", | |
17 "//blimp/client/core:core_shim", | |
18 ] | |
19 } | |
20 | |
21 # All code in //blimp/client/* should depend on this target instead of | |
22 # //blimp/client/public to ensure there are no circular dependencies or | |
23 # duplicate symbols regardless of whether enable_blimp is set or not. | |
24 source_set("public_headers") { | |
25 visibility = [ "//blimp/client/*" ] | |
26 | |
11 sources = [ | 27 sources = [ |
28 "blimp_client_context.h", | |
29 "blimp_client_context_delegate.h", | |
12 "blimp_contents.h", | 30 "blimp_contents.h", |
13 "blimp_contents_observer.h", | 31 "blimp_contents_observer.h", |
14 "blimp_navigation_controller.h", | 32 "blimp_navigation_controller.h", |
15 ] | 33 ] |
16 | 34 |
17 deps = [ | 35 deps = [ |
18 "//base", | 36 "//base", |
37 "//components/keyed_service/core", | |
19 "//url", | 38 "//url", |
20 ] | 39 ] |
40 | |
41 if (is_android) { | |
42 sources += [ "android/blimp_jni_registrar.h" ] | |
43 } | |
21 } | 44 } |
22 | 45 |
23 if (is_android) { | 46 if (is_android) { |
24 android_library("public_java") { | 47 # Only //chrome should ever depend on this. Code in //blimp/client/* should |
48 # instead use //blimp/client/public:public_headers_java directly. | |
49 java_group("public_java") { | |
50 visibility = [ "//chrome/*" ] | |
51 | |
52 deps = [ | |
53 ":public_headers_java", | |
54 "//blimp/client/core:core_shim_java", | |
55 ] | |
56 } | |
57 | |
58 # All code in //blimp/client/* should depend on this target instead of | |
59 # //blimp/client/public:public_java to ensure there are no circular | |
60 # dependencies or duplicate files regardless of whether enable_blimp is set or | |
61 # not. | |
62 android_library("public_headers_java") { | |
Dirk Pranke
2016/07/15 18:31:21
is "interfaces" more appropriate than "headers" he
nyquist
2016/07/15 19:03:54
Discussed internally in the team, and we decided t
Dirk Pranke
2016/07/15 19:07:59
Yup, that's fine.
| |
63 visibility = [ "//blimp/client/*" ] | |
64 | |
25 java_files = [ | 65 java_files = [ |
66 "android/java/src/org/chromium/blimp_public/BlimpClientContext.java", | |
26 "android/java/src/org/chromium/blimp_public/BlimpContents.java", | 67 "android/java/src/org/chromium/blimp_public/BlimpContents.java", |
27 "android/java/src/org/chromium/blimp_public/BlimpContentsObserver.java", | 68 "android/java/src/org/chromium/blimp_public/BlimpContentsObserver.java", |
28 "android/java/src/org/chromium/blimp_public/BlimpNavigationController.java ", | 69 "android/java/src/org/chromium/blimp_public/BlimpNavigationController.java ", |
29 "android/java/src/org/chromium/blimp_public/EmptyBlimpContentsObserver.jav a", | 70 "android/java/src/org/chromium/blimp_public/EmptyBlimpContentsObserver.jav a", |
30 ] | 71 ] |
31 } | 72 } |
32 } | 73 } |
OLD | NEW |