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

Unified Diff: mojo/mojo_public_gles2_for_loadable_module.gypi

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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/mojo_base.gyp ('k') | mojo/package_manager/content_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_public_gles2_for_loadable_module.gypi
diff --git a/mojo/mojo_public_gles2_for_loadable_module.gypi b/mojo/mojo_public_gles2_for_loadable_module.gypi
deleted file mode 100644
index cd5dbbf1a15f84cdf30ed731ac1cc98a547d6783..0000000000000000000000000000000000000000
--- a/mojo/mojo_public_gles2_for_loadable_module.gypi
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# In the non component build, the thunks need to be linked directly into the
-# loadable module since they define symbols that should be exported from that
-# library. So, this variable expands out to either list the sources directly (in
-# the component build where no symbols need to be exported) a dependency.
-{
- 'conditions': [
- ['component=="shared_library"', {
- 'dependencies': [
- '<(DEPTH)/mojo/mojo.gyp:mojo_gles2_impl',
- ],
- }, { # component!="shared_library"
- 'defines': [
- 'MOJO_GLES2_IMPLEMENTATION',
- 'GLES2_USE_MOJO',
- ],
- 'include_dirs': [
- '<(DEPTH)',
- ],
- 'dependencies': [
- '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers'
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(DEPTH)',
- ],
- 'defines': [
- 'GLES2_USE_MOJO',
- ],
- },
- 'sources': [
- '<(DEPTH)/third_party/mojo/src/mojo/public/c/gles2/gles2.h',
- '<(DEPTH)/third_party/mojo/src/mojo/public/c/gles2/gles2_export.h',
- '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_thunks.cc',
- '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_thunks.h',
- '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.cc',
- '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.h',
- '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.cc',
- '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.h',
- '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.cc',
- '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h',
- ],
- }]
- ]
-}
« no previous file with comments | « mojo/mojo_base.gyp ('k') | mojo/package_manager/content_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698