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

Unified Diff: services/ui/BUILD.gn

Issue 2557213002: Build services as standalone executables (Closed)
Patch Set: remove DCHECKs with side effects -_- Created 4 years 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/tracing/BUILD.gn ('k') | testing/buildbot/chromium.android.json » ('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 416f4750287eaead64fac46798ca1dcf1cb30c93..f8d88227ac86e4d7227d4d4ada39448cd63f8a8d 100644
--- a/services/ui/BUILD.gn
+++ b/services/ui/BUILD.gn
@@ -24,6 +24,7 @@ service("ui") {
]
deps = [
+ ":copy_gl_libraries",
":lib",
":resources_100",
":resources_200",
@@ -32,11 +33,8 @@ service("ui") {
"//services/tracing/public/interfaces",
]
- if (is_win) {
- deps += [ ":copy_gl_libraries" ]
- }
-
data_deps = [
+ ":copy_gl_libraries",
":manifest",
"//services/ui/ime/test_ime_driver",
]
@@ -53,9 +51,13 @@ service_manifest("manifest") {
source = "manifest.json"
}
-if (is_win) {
- copy("copy_gl_libraries") {
- deps = [
+copy("copy_gl_libraries") {
+ deps = [
+ "//third_party/mesa:osmesa",
+ ]
+
+ if (is_win) {
+ deps += [
"//third_party/angle:libEGL",
"//third_party/angle:libGLESv2",
]
@@ -63,12 +65,19 @@ if (is_win) {
sources = [
"$root_shlib_dir/libEGL.dll",
"$root_shlib_dir/libGLESv2.dll",
+ "$root_shlib_dir/osmesa.dll",
]
-
- outputs = [
- "$root_out_dir/$packages_directory/ui/{{source_file_part}}",
+ } 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/tracing/BUILD.gn ('k') | testing/buildbot/chromium.android.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698