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

Unified Diff: mojo/public/platform/native/BUILD.gn

Issue 782693004: Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hack mojo_system_impl gypi for android :| Created 6 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
Index: mojo/public/platform/native/BUILD.gn
diff --git a/mojo/public/platform/native/BUILD.gn b/mojo/public/platform/native/BUILD.gn
index 63a0136aa0d7e3685f856bf43743837bb313b6bb..21382a640ad5dc1b86e61e4a1e599886987b3b4a 100644
--- a/mojo/public/platform/native/BUILD.gn
+++ b/mojo/public/platform/native/BUILD.gn
@@ -2,10 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-source_set("system_thunks") {
- visibility = [
- "//mojo/public/c/system:for_component",
- "//mojo/public/c/system:for_shared_library",
+import("../../mojo_sdk.gni")
+
+mojo_sdk_source_set("system_thunks") {
+ mojo_sdk_visibility = [
+ "mojo/public/c/system:for_component",
+ "mojo/public/c/system:for_shared_library",
]
sources = [
@@ -13,9 +15,7 @@ source_set("system_thunks") {
"system_thunks.cc",
]
defines = [ "MOJO_SYSTEM_IMPLEMENTATION" ]
- deps = [
- "//mojo/public/c/system",
- ]
+ mojo_sdk_deps = [ "mojo/public/c/system" ]
# The GYP target analogous to this one builds this code into a
# static library. When building for Android, both the GYP and GN
@@ -27,9 +27,8 @@ source_set("system_thunks") {
# source_set here, this flag change is not needed.
}
-# GYP version: mojo/mojo_public_gles2_for_loadable_module.gypi
-source_set("gles2_thunks") {
- visibility = [ "//mojo/public/gles2:for_shared_library" ]
+mojo_sdk_source_set("gles2_thunks") {
+ mojo_sdk_visibility = [ "mojo/public/gles2:for_shared_library" ]
sources = [
"gles2_thunks.cc",
@@ -44,12 +43,12 @@ source_set("gles2_thunks") {
defines = [ "MOJO_GLES2_IMPLEMENTATION" ]
- configs += [ "//third_party/khronos:khronos_headers" ]
+ configs = [ "//third_party/khronos:khronos_headers" ]
- deps = [
- "//mojo/public/c/gles2",
- "//mojo/public/c/environment",
- "//mojo/public/c/system",
+ mojo_sdk_deps = [
+ "mojo/public/c/gles2:headers",
+ "mojo/public/c/environment",
+ "mojo/public/c/system",
]
if (is_mac) {

Powered by Google App Engine
This is Rietveld 408576698