Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(650)

Unified Diff: services/ui/BUILD.gn

Issue 2651953002: Revert of [Service Manager] Get rid of dynamic service discovery (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/service_manager/tests/shutdown/BUILD.gn ('k') | services/ui/clipboard/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/BUILD.gn
diff --git a/services/ui/BUILD.gn b/services/ui/BUILD.gn
index b202be7d48b163bc323dbd3d6e7db679cf96b5ce..163c0dce3b45c67368c31c65a097ee31f4c85b73 100644
--- a/services/ui/BUILD.gn
+++ b/services/ui/BUILD.gn
@@ -6,6 +6,7 @@
import("//testing/test.gni")
import("//services/service_manager/public/cpp/service.gni")
import("//services/service_manager/public/service_manifest.gni")
+import("//services/service_manager/public/constants.gni")
import("//tools/grit/repack.gni")
group("all") {
@@ -23,23 +24,60 @@
]
deps = [
+ ":copy_gl_libraries",
":lib",
+ ":resources_100",
+ ":resources_200",
+ ":resources_strings",
"//services/service_manager/public/cpp:sources",
"//services/tracing/public/interfaces",
]
data_deps = [
+ ":copy_gl_libraries",
":manifest",
- ":resources_100",
- ":resources_200",
- ":resources_strings",
"//services/ui/ime/test_ime_driver",
+ ]
+
+ resources = [
+ "$root_out_dir/mus_app_resources_strings.pak",
+ "$root_out_dir/mus_app_resources_100.pak",
+ "$root_out_dir/mus_app_resources_200.pak",
]
}
service_manifest("manifest") {
name = "ui"
source = "manifest.json"
+}
+
+copy("copy_gl_libraries") {
+ deps = [
+ "//third_party/mesa:osmesa",
+ ]
+
+ if (is_win) {
+ deps += [
+ "//third_party/angle:libEGL",
+ "//third_party/angle:libGLESv2",
+ ]
+
+ sources = [
+ "$root_shlib_dir/libEGL.dll",
+ "$root_shlib_dir/libGLESv2.dll",
+ "$root_shlib_dir/osmesa.dll",
+ ]
+ } else if (is_android || is_linux) {
+ sources = [
+ "$root_shlib_dir/libosmesa.so",
+ ]
+ } else {
+ sources = []
+ }
+
+ outputs = [
+ "$root_out_dir/$packages_directory/ui/{{source_file_part}}",
+ ]
}
source_set("lib") {
« no previous file with comments | « services/service_manager/tests/shutdown/BUILD.gn ('k') | services/ui/clipboard/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698