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

Unified Diff: ppapi/native_client/src/trusted/plugin/plugin.gypi

Issue 876483002: NaCl: Move src/trusted/plugin/ to components/nacl/renderer/plugin/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Update #include guards Created 5 years, 11 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
Index: ppapi/native_client/src/trusted/plugin/plugin.gypi
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.gypi b/ppapi/native_client/src/trusted/plugin/plugin.gypi
deleted file mode 100644
index aa8f3ac6f3f2ec732436c028afec81a531d2cf72..0000000000000000000000000000000000000000
--- a/ppapi/native_client/src/trusted/plugin/plugin.gypi
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright (c) 2012 The Native Client Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'variables': {
- 'chromium_code': 1, # Use higher warning level.
- 'common_sources': [
- 'module_ppapi.cc',
- 'nacl_subprocess.cc',
- 'plugin.cc',
- 'pnacl_coordinator.cc',
- 'pnacl_resources.cc',
- 'pnacl_translate_thread.cc',
- 'ppapi_entrypoints.cc',
- 'sel_ldr_launcher_chrome.cc',
- 'service_runtime.cc',
- 'srpc_client.cc',
- 'srpc_params.cc',
- 'temporary_file.cc',
- 'utility.cc',
- ],
- },
- 'includes': [
- '../../../../../native_client/build/common.gypi',
- ],
- 'target_defaults': {
- 'variables': {
- 'target_platform': 'none',
- },
- 'conditions': [
- ['OS=="linux"', {
- 'cflags': [
- '-Wno-long-long',
- ],
- 'cflags!': [
- '-Wno-unused-parameter', # be a bit stricter to match NaCl flags.
- ],
- 'conditions': [
- ['asan!=1 and msan!=1 and ubsan_vptr!=1', {
- 'ldflags': [
- # Catch unresolved symbols.
- '-Wl,-z,defs',
- ],
- }],
- ],
- 'libraries': [
- '-ldl',
- ],
- }],
- ['OS=="mac"', {
- 'cflags': [
- '-Wno-long-long',
- ],
- 'cflags!': [
- '-Wno-unused-parameter', # be a bit stricter to match NaCl flags.
- ],
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
- ],
- },
- }],
- ['OS=="win"', {
- 'defines': [
- 'WIN32',
- '_WINDOWS'
- ],
- 'flags': [
- '-fPIC',
- '-Wno-long-long',
- ],
- 'link_settings': {
- 'libraries': [
- '-lgdi32.lib',
- '-luser32.lib',
- ],
- },
- }],
- ],
- },
-}

Powered by Google App Engine
This is Rietveld 408576698