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

Unified Diff: ppapi/native_client/src/shared/ppapi/build.scons

Issue 11079003: Clean up NaCl's SCons build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 2 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 | « ppapi/native_client/ppapi_scons_files.py ('k') | ppapi/native_client/src/shared/ppapi_proxy/build.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/native_client/src/shared/ppapi/build.scons
diff --git a/ppapi/native_client/src/shared/ppapi/build.scons b/ppapi/native_client/src/shared/ppapi/build.scons
deleted file mode 100644
index 1269684d2c497b1a3cde18435b96a17c5ca62cad..0000000000000000000000000000000000000000
--- a/ppapi/native_client/src/shared/ppapi/build.scons
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- python -*-
-# Copyright 2011 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.
-
-import gyp_extract
-Import('env')
-
-# Underlay $SOURCE_ROOT/ppapi in this directory.
-Dir('.').addRepository(Dir('#/../ppapi'))
-
-if env.Bit('linux'):
- env.Append(CCFLAGS=['-fPIC'])
-
-# Don't treat warnings as errors on Windows
-if env.Bit('windows'):
- env.FilterOut(CCFLAGS=['/WX'])
-
-# TODO(ncbray): reenable
-# http://code.google.com/p/nativeclient/issues/detail?id=1643
-env.FilterOut(CCFLAGS=['-Wswitch-enum'])
-
-# Load ppapi_cpp.gypi
-# Unfortunately gyp_extract does not handle variables or includes so we must
-# pull the list of sources from ppapi_sources.gypi directly.
-
-ppapi_sources_gypi = open(
- env.File('$SOURCE_ROOT/ppapi/ppapi_sources.gypi').abspath, 'r').read()
-ppapi_sources_list = eval(ppapi_sources_gypi)['variables']['cpp_source_files']
-
-ppapi_cpp_gypi = gyp_extract.LoadGypFile(
- env.File('$SOURCE_ROOT/ppapi/ppapi_cpp.gypi').abspath)
-
-cpp_sources = (
- [src for src in ppapi_sources_list if src.endswith('.cc')] +
- gyp_extract.GypTargetSources(
- ppapi_cpp_gypi, 'ppapi_cpp', '.*\.cc')
-)
-
-env.DualLibrary('ppapi_cpp', cpp_sources)
« no previous file with comments | « ppapi/native_client/ppapi_scons_files.py ('k') | ppapi/native_client/src/shared/ppapi_proxy/build.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698