diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-04 19:46:09 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-04 19:46:09 +0000 |
| commit | 9d7bc25cd82631604aaa534a383f38d31c8f8d1f (patch) | |
| tree | bd26052db10861018a66600fd5c53e80dc2eddff /gears/SConscript.libmozjs | |
| parent | dcc494e914525bba9d084e03db8508ae87dc3e76 (diff) | |
| download | chromium_src-9d7bc25cd82631604aaa534a383f38d31c8f8d1f.zip chromium_src-9d7bc25cd82631604aaa534a383f38d31c8f8d1f.tar.gz chromium_src-9d7bc25cd82631604aaa534a383f38d31c8f8d1f.tar.bz2 | |
Update DEPS to pull in gears r3073, and fix the SConscripts to compile in the
aftermath.
Review URL: http://codereview.chromium.org/13114
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6374 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gears/SConscript.libmozjs')
| -rw-r--r-- | gears/SConscript.libmozjs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/gears/SConscript.libmozjs b/gears/SConscript.libmozjs index 5f29e72..0342b0f 100644 --- a/gears/SConscript.libmozjs +++ b/gears/SConscript.libmozjs @@ -110,4 +110,18 @@ input_files = [ '$MOZJS_DIR/nspr/pr/src/md/unix/os_Darwin_x86.s', ] +if env['OS'] == 'osx': + # Safari-specific SpiderMonkey files. + input_files += [ + '$MOZJS_DIR/nspr/pr/src/md/unix/darwin.c', + '$MOZJS_DIR/nspr/pr/src/md/unix/os_Darwin_ppc.s', + '$MOZJS_DIR/nspr/pr/src/md/unix/os_Darwin_x86.s', + ] +elif env['OS'] == 'android': + # Files needed for Android builds. + input_files += [ + '$MOZJS_DIR/nspr/pr/src/md/unix/linux.c', + '$MOZJS_DIR/nspr/pr/src/misc/prlog2.c', + ] + env.GearsStaticLibrary('mozjs-gears', input_files) |