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

Unified Diff: mojo/mojo_edk.gyp

Issue 2044023004: Mojo: Eliminate duplicate C API symbols (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 4 years, 6 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/mojo_base.gyp ('k') | mojo/mojo_edk_nacl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_edk.gyp
diff --git a/mojo/mojo_edk.gyp b/mojo/mojo_edk.gyp
index 9014ee498be9683312927ba58347069d27c96ce5..fb281861b7ea86b94e66b3b862110255a1014a08 100644
--- a/mojo/mojo_edk.gyp
+++ b/mojo/mojo_edk.gyp
@@ -3,9 +3,9 @@
# found in the LICENSE file.
{
- 'includes': [
- 'mojo_variables.gypi',
- ],
+ 'variables': {
+ 'chromium_code': 1,
+ },
'target_defaults' : {
'include_dirs': [
'..',
@@ -54,13 +54,11 @@
'../base/base.gyp:base',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../crypto/crypto.gyp:crypto',
- 'mojo_public.gyp:mojo_system_headers',
+ 'mojo_public.gyp:mojo_public_system',
'mojo_system_ports',
],
'defines': [
'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
- 'MOJO_SYSTEM_IMPLEMENTATION',
- 'MOJO_USE_SYSTEM_IMPL',
],
'sources': [
'edk/embedder/configuration.h',
@@ -148,10 +146,6 @@
'edk/embedder/test_embedder.cc',
'edk/embedder/test_embedder.h',
],
- 'all_dependent_settings': {
- # Ensures that dependent projects import the core functions on Windows.
- 'defines': ['MOJO_USE_SYSTEM_IMPL'],
- },
'conditions': [
['OS=="android"', {
'dependencies': [
« no previous file with comments | « mojo/mojo_base.gyp ('k') | mojo/mojo_edk_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698