diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-09 17:35:35 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-09 17:35:35 +0000 |
| commit | c04558992dcba248ff8477021addf14b3b5b74f6 (patch) | |
| tree | 7908abf3a882071017f2681c3fb97b8bd8d340e4 /gears/SConscript.libmozjs | |
| parent | 9333f1812b353233e6c492a6dfe7efb3a03717a3 (diff) | |
| download | chromium_src-c04558992dcba248ff8477021addf14b3b5b74f6.zip chromium_src-c04558992dcba248ff8477021addf14b3b5b74f6.tar.gz chromium_src-c04558992dcba248ff8477021addf14b3b5b74f6.tar.bz2 | |
First pass at adding support for building Android via scons.
Review URL: http://codereview.chromium.org/13644
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gears/SConscript.libmozjs')
| -rw-r--r-- | gears/SConscript.libmozjs | 64 |
1 files changed, 40 insertions, 24 deletions
diff --git a/gears/SConscript.libmozjs b/gears/SConscript.libmozjs index 0342b0f..23a311529 100644 --- a/gears/SConscript.libmozjs +++ b/gears/SConscript.libmozjs @@ -7,31 +7,49 @@ Import('env') env = env.Clone( ) -env.Append( - CPPDEFINES = [ - 'JS_THREADSAFE', - 'XP_UNIX', - 'DARWIN', - 'HAVE_BSD_FLOCK', - 'XP_MACOSX', - 'HAVE_LCHOWN', - 'HAVE_STRERROR', - 'FORCE_PR_LOG', - '_PR_PTHREADS', - 'UHAVE_CVAR_BUILT_ON_SEM', - '_NSPR_BUILD_', - 'OSARCH=Darwin', - 'STATIC_JS_API', - 'JS_USE_SAFE_ARENA', - 'TRIMMED', - 'JS_HAS_EXPORT_IMPORT' - ], - CPPPATH = '$MOZJS_INCLUDE_PATHS', -) +if env['OS'] == 'osx': + env.Append( + CPPDEFINES = [ + 'JS_THREADSAFE', + 'XP_UNIX', + 'DARWIN', + 'HAVE_BSD_FLOCK', + 'XP_MACOSX', + 'HAVE_LCHOWN', + 'HAVE_STRERROR', + 'FORCE_PR_LOG', + '_PR_PTHREADS', + 'UHAVE_CVAR_BUILT_ON_SEM', + '_NSPR_BUILD_', + 'OSARCH=Darwin', + 'STATIC_JS_API', + 'JS_USE_SAFE_ARENA', + 'TRIMMED', + 'JS_HAS_EXPORT_IMPORT' + ], + CPPPATH = '$MOZJS_INCLUDE_PATHS', + ) +elif env['OS'] == 'android': + env.Append( + CPPDEFINES = [ + 'JS_THREADSAFE', + 'XP_UNIX', + 'HAVE_STRERROR', + 'FORCE_PR_LOG', + '_PR_PTHREADS', + 'UHAVE_CVAR_BUILT_ON_SEM', + '_NSPR_BUILD_', + 'OSARCH=Android', + 'STATIC_JS_API', + 'JS_USE_SAFE_ARENA', + 'TRIMMED', + 'JS_HAS_EXPORT_IMPORT', + ], + CPPPATH = '$MOZJS_INCLUDE_PATHS', + ) input_files = [ # Common Files - '$MOZJS_DIR/nspr/pr/src/md/unix/darwin.c', '$MOZJS_DIR/js/src/jsapi.c', '$MOZJS_DIR/js/src/jsarena.c', '$MOZJS_DIR/js/src/jsarray.c', @@ -106,8 +124,6 @@ input_files = [ '$MOZJS_DIR/nspr/pr/src/md/unix/unix.c', '$MOZJS_DIR/nspr/pr/src/md/unix/unix_errors.c', '$MOZJS_DIR/nspr/pr/src/md/unix/uxproces.c', - '$MOZJS_DIR/nspr/pr/src/md/unix/os_Darwin_ppc.s', - '$MOZJS_DIR/nspr/pr/src/md/unix/os_Darwin_x86.s', ] if env['OS'] == 'osx': |