Chromium Code Reviews| Index: blimp/client/public/BUILD.gn |
| diff --git a/blimp/client/public/BUILD.gn b/blimp/client/public/BUILD.gn |
| index bd422f4a91e2395e776a5dce2369307dbc59df72..4589c66cd4b86a0ad32b1503425d9a5548518d96 100644 |
| --- a/blimp/client/public/BUILD.gn |
| +++ b/blimp/client/public/BUILD.gn |
| @@ -7,8 +7,26 @@ if (is_android) { |
| import("//build/config/android/rules.gni") |
| } |
| -source_set("public") { |
| +# Only //chrome should ever depend on this. Code in //blimp/client/* should |
| +# 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.
|
| +group("public") { |
| + visibility = [ "//chrome/*" ] |
| + |
| + deps = [ |
| + ":public_headers", |
| + "//blimp/client/core:core_shim", |
| + ] |
| +} |
| + |
| +# All code in //blimp/client/* should depend on this target instead of |
| +# //blimp/client/public to ensure there are no circular dependencies or |
| +# duplicate symbols regardless of whether enable_blimp is set or not. |
| +source_set("public_headers") { |
| + visibility = [ "//blimp/client/*" ] |
| + |
| sources = [ |
| + "blimp_client_context.h", |
| + "blimp_client_context_delegate.h", |
| "blimp_contents.h", |
| "blimp_contents_observer.h", |
| "blimp_navigation_controller.h", |
| @@ -16,13 +34,36 @@ source_set("public") { |
| deps = [ |
| "//base", |
| + "//components/keyed_service/core", |
| "//url", |
| ] |
| + |
| + if (is_android) { |
| + sources += [ "android/blimp_jni_registrar.h" ] |
| + } |
| } |
| if (is_android) { |
| - android_library("public_java") { |
| + # Only //chrome should ever depend on this. Code in //blimp/client/* should |
| + # instead use //blimp/client/public:public_headers_java directly. |
| + java_group("public_java") { |
| + visibility = [ "//chrome/*" ] |
| + |
| + deps = [ |
| + ":public_headers_java", |
| + "//blimp/client/core:core_shim_java", |
| + ] |
| + } |
| + |
| + # All code in //blimp/client/* should depend on this target instead of |
| + # //blimp/client/public:public_java to ensure there are no circular |
| + # dependencies or duplicate files regardless of whether enable_blimp is set or |
| + # not. |
| + 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.
|
| + visibility = [ "//blimp/client/*" ] |
| + |
| java_files = [ |
| + "android/java/src/org/chromium/blimp_public/BlimpClientContext.java", |
| "android/java/src/org/chromium/blimp_public/BlimpContents.java", |
| "android/java/src/org/chromium/blimp_public/BlimpContentsObserver.java", |
| "android/java/src/org/chromium/blimp_public/BlimpNavigationController.java", |