From 9d7bc25cd82631604aaa534a383f38d31c8f8d1f Mon Sep 17 00:00:00 2001 From: "mpcomplete@chromium.org" Date: Thu, 4 Dec 2008 19:46:09 +0000 Subject: 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 --- gears/SConscript.libmozjs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gears/SConscript.libmozjs') 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) -- cgit v1.1