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

Unified Diff: mojo/public/gles2/BUILD.gn

Issue 604223002: Fix up gles2 thunk targets a bit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn_check_mojo
Patch Set: declare proper gles2 dependency in png_viewer Created 6 years, 3 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 | « mojo/examples/png_viewer/BUILD.gn ('k') | mojo/public/gles2/gles2_interface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/gles2/BUILD.gn
diff --git a/mojo/public/gles2/BUILD.gn b/mojo/public/gles2/BUILD.gn
index b5172d39285129629bf83291211693311e9f6d3e..5c21e78c726f5a61807f039f7eab439314201222 100644
--- a/mojo/public/gles2/BUILD.gn
+++ b/mojo/public/gles2/BUILD.gn
@@ -15,49 +15,21 @@
# //mojo/public/gles2:for_shared_library to your deps
group("for_shared_library") {
+ public_configs = [ "//third_party/khronos:khronos_headers" ]
+ public_deps = [ "//mojo/public/c/gles2" ]
+
if (is_component_build) {
deps = [ "//mojo/gles2" ]
} else {
- deps = [ ":gles2" ]
+ deps = [ "//mojo/public/platform/native:gles2_thunks" ]
}
}
group("for_component") {
- if (is_component_build) {
- deps = [ "//mojo/gles2" ]
- }
-}
-
-# GYP version: mojo/mojo_public.gypi:mojo_gles2
-static_library("gles2") {
- visibility = [ ":for_shared_library" ]
-
- sources = [
- "../platform/native/gles2_thunks.cc",
- "../platform/native/gles2_thunks.h",
- "../platform/native/gles2_impl_thunks.cc",
- "../platform/native/gles2_impl_thunks.h",
- "../platform/native/gles2_impl_chromium_texture_mailbox_thunks.cc",
- "../platform/native/gles2_impl_chromium_texture_mailbox_thunks.h",
- "../platform/native/gles2_impl_chromium_sync_point_thunks.cc",
- "../platform/native/gles2_impl_chromium_sync_point_thunks.h",
- "gles2_interface.h",
- ]
-
public_configs = [ "//third_party/khronos:khronos_headers" ]
-
public_deps = [ "//mojo/public/c/gles2" ]
- defines = [
- "MOJO_GLES2_IMPLEMENTATION",
- ]
- deps = [
- "//mojo/public/c/environment",
- "//mojo/public/c/system",
- ]
-
- if (is_mac) {
- # TODO(GYP): Make it a run-path dependent library.
- # 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
+ if (is_component_build) {
+ deps = [ "//mojo/gles2" ]
}
}
« no previous file with comments | « mojo/examples/png_viewer/BUILD.gn ('k') | mojo/public/gles2/gles2_interface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698