| 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 # Only //chrome should ever depend on this. Code in //blimp/client/* should | 10 # Only //chrome should ever depend on this. Code in //blimp/client/* should |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 source_set("public_headers") { | 26 source_set("public_headers") { |
| 27 visibility = [ "//blimp/client/*" ] | 27 visibility = [ "//blimp/client/*" ] |
| 28 | 28 |
| 29 sources = [ | 29 sources = [ |
| 30 "blimp_client_context.h", | 30 "blimp_client_context.h", |
| 31 "blimp_client_context_delegate.h", | 31 "blimp_client_context_delegate.h", |
| 32 "contents/blimp_contents.h", | 32 "contents/blimp_contents.h", |
| 33 "contents/blimp_contents_observer.cc", | 33 "contents/blimp_contents_observer.cc", |
| 34 "contents/blimp_contents_observer.h", | 34 "contents/blimp_contents_observer.h", |
| 35 "contents/blimp_navigation_controller.h", | 35 "contents/blimp_navigation_controller.h", |
| 36 "session/assignment.cc", |
| 37 "session/assignment.h", |
| 36 ] | 38 ] |
| 37 | 39 |
| 38 public_deps = [ | 40 public_deps = [ |
| 39 "//base", | 41 "//base", |
| 40 "//components/keyed_service/core", | 42 "//components/keyed_service/core", |
| 43 "//net", |
| 41 "//url", | 44 "//url", |
| 42 ] | 45 ] |
| 43 | 46 |
| 44 if (is_android) { | 47 if (is_android) { |
| 45 sources += [ "android/blimp_jni_registrar.h" ] | 48 sources += [ "android/blimp_jni_registrar.h" ] |
| 46 } | 49 } |
| 47 } | 50 } |
| 48 | 51 |
| 49 if (is_android) { | 52 if (is_android) { |
| 50 # Only //chrome should ever depend on this. Code in //blimp/client/* should | 53 # Only //chrome should ever depend on this. Code in //blimp/client/* should |
| (...skipping 18 matching lines...) Expand all Loading... |
| 69 | 72 |
| 70 java_files = [ | 73 java_files = [ |
| 71 "android/java/src/org/chromium/blimp_public/contents/BlimpContents.java", | 74 "android/java/src/org/chromium/blimp_public/contents/BlimpContents.java", |
| 72 "android/java/src/org/chromium/blimp_public/contents/BlimpContentsObserver
.java", | 75 "android/java/src/org/chromium/blimp_public/contents/BlimpContentsObserver
.java", |
| 73 "android/java/src/org/chromium/blimp_public/contents/BlimpNavigationContro
ller.java", | 76 "android/java/src/org/chromium/blimp_public/contents/BlimpNavigationContro
ller.java", |
| 74 "android/java/src/org/chromium/blimp_public/contents/EmptyBlimpContentsObs
erver.java", | 77 "android/java/src/org/chromium/blimp_public/contents/EmptyBlimpContentsObs
erver.java", |
| 75 "android/java/src/org/chromium/blimp_public/BlimpClientContext.java", | 78 "android/java/src/org/chromium/blimp_public/BlimpClientContext.java", |
| 76 "android/java/src/org/chromium/blimp_public/BlimpClientContextDelegate.jav
a", | 79 "android/java/src/org/chromium/blimp_public/BlimpClientContextDelegate.jav
a", |
| 77 "android/java/src/org/chromium/blimp_public/BlimpSettingsCallbacks.java", | 80 "android/java/src/org/chromium/blimp_public/BlimpSettingsCallbacks.java", |
| 78 ] | 81 ] |
| 82 |
| 83 deps = [ |
| 84 "//third_party/android_tools:android_support_annotations_java", |
| 85 ] |
| 86 |
| 87 # The enums are added here for convenience for embedders, so they can still |
| 88 # only depend on :public_java. |
| 89 srcjar_deps = [ ":public_headers_java_enums_srcjar" ] |
| 90 } |
| 91 |
| 92 java_cpp_enum("public_headers_java_enums_srcjar") { |
| 93 visibility = [ ":*" ] |
| 94 |
| 95 sources = [ |
| 96 "session/assignment.h", |
| 97 ] |
| 79 } | 98 } |
| 80 } | 99 } |
| OLD | NEW |