Added libjpeg and zlib to SDK

These libraries are already in Chrome's third party, so we just add
a library.dsc to build them.  They will eventually need to be converted
to GYP file along with the rest of the NaCl SDK gyp work.

R=binji@chromium.org
BUG=162141


Review URL: https://chromiumcodereview.appspot.com/11417098

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171031 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 147 insertions, 2 deletions

diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 5a88109..cdd91a0 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -573,11 +573,13 @@ EXAMPLE_LIST = [
 ]
 
 LIBRARY_LIST = [
+  'libjpeg',
   'nacl_mounts',
   'ppapi',
   'ppapi_cpp',
   'ppapi_gles2',
   'pthread',
+  'zlib',
 ]
 
 LIB_DICT = {
diff --git a/native_client_sdk/src/build_tools/library.mk b/native_client_sdk/src/build_tools/library.mk
index f5fdb33..a884a24 100644
--- a/native_client_sdk/src/build_tools/library.mk
+++ b/native_client_sdk/src/build_tools/library.mk
@@ -20,7 +20,7 @@ CHROME_PATH?=Undefined
 #
 # Defaults
 #
-NACL_WARNINGS:=-Wno-long-long -Wall -Wswitch-enum -Werror -pedantic
+NACL_WARNINGS:=-Wno-long-long
 
 
 #
diff --git a/native_client_sdk/src/build_tools/make_rules.py b/native_client_sdk/src/build_tools/make_rules.py
index ad5c819..213fa9f 100755
--- a/native_client_sdk/src/build_tools/make_rules.py
+++ b/native_client_sdk/src/build_tools/make_rules.py
@@ -43,7 +43,7 @@ TRANSLATE:=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-translate
 """
 
 LINUX_DEFAULTS = """
-LINUX_WARNINGS?=-Wno-long-long -Wall -Wswitch-enum -Werror
+LINUX_WARNINGS?=-Wno-long-long
 LINUX_CC?=gcc -c
 LINUX_CXX?=g++ -c
 LINUX_LINK?=g++
diff --git a/native_client_sdk/src/libraries/libjpeg/library.dsc b/native_client_sdk/src/libraries/libjpeg/library.dsc
new file mode 100644
index 0000000..0d40f3c
--- /dev/null
+++ b/native_client_sdk/src/libraries/libjpeg/library.dsc
@@ -0,0 +1,87 @@
+{
+  'TOOLS': ['newlib', 'glibc', 'linux', 'win'],
+  'SEARCH': [
+    '../../../../third_party/libjpeg',
+  ],
+  'TARGETS': [
+    {
+      'NAME' : 'libjpeg',
+      'TYPE' : 'lib',
+      'INCLUDES': ['../../include/libjpeg'],      
+      'SOURCES' : [
+        'jcapimin.c',
+        'jcapistd.c',
+        'jccoefct.c',
+        'jccolor.c',
+        'jcdctmgr.c',
+        'jchuff.c',
+        'jcinit.c',
+        'jcmainct.c',
+        'jcmarker.c',
+        'jcmaster.c',
+        'jcomapi.c',
+        'jcparam.c',
+        'jcphuff.c',
+        'jcprepct.c',
+        'jcsample.c',
+        'jdapimin.c',
+        'jdapistd.c',
+        'jdatadst.c',
+        'jdatasrc.c',
+        'jdcoefct.c',
+        'jdcolor.c',
+        'jddctmgr.c',
+        'jdhuff.c',
+        'jdinput.c',
+        'jdmainct.c',
+        'jdmarker.c',
+        'jdmaster.c',
+        'jdmerge.c',
+        'jdphuff.c',
+        'jdpostct.c',
+        'jdsample.c',
+        'jerror.c',
+        'jfdctflt.c',
+        'jfdctfst.c',
+        'jfdctint.c',
+        'jidctflt.c',
+        'jidctfst.c',
+        'jidctint.c',
+        'jidctred.c',
+        'jmemmgr.c',
+        'jmemnobs.c',
+        'jquant1.c',
+        'jquant2.c',
+        'jutils.c',
+      ],
+    }
+  ],
+  'HEADERS': [
+    {
+      'DEST': 'include/libjpeg',
+      'FILES': [
+        'jchuff.h',
+        'jconfig.h',
+        'jdct.h',
+        'jdhuff.h',
+        'jerror.h',
+        'jinclude.h',
+        'jmemsys.h',
+        'jmorecfg.h',
+        'jpegint.h',
+        'jpeglib.h',
+        'jpeglibmangler.h',
+        'jversion.h',
+      ],
+    }
+  ],
+  'DATA': [
+    'LICENSE',
+    'README',
+    'README.chromium',
+  ],
+  'DEST': 'src',
+  'NAME': 'libjpeg',
+  'EXPERIMENTAL': True,
+}
+
diff --git a/native_client_sdk/src/libraries/zlib/library.dsc b/native_client_sdk/src/libraries/zlib/library.dsc
new file mode 100644
index 0000000..2ce423a
--- /dev/null
+++ b/native_client_sdk/src/libraries/zlib/library.dsc
@@ -0,0 +1,56 @@
+{
+  'TOOLS': ['newlib', 'glibc', 'linux', 'win'],
+  'SEARCH': [
+    '../../../../third_party/zlib',
+  ],
+  'TARGETS': [
+    {
+      'NAME' : 'zlib',
+      'TYPE' : 'lib',
+      'INCLUDES': ['../../include/zlib'],      
+      'SOURCES' : [
+        'adler32.c',
+        'compress.c',
+        'contrib',
+        'crc32.c',
+        'deflate.c',
+        'gzio.c',
+        'infback.c',
+        'inffast.c',
+        'inflate.c',
+        'inftrees.c',
+        'trees.c',
+        'uncompr.c',
+        'zutil.c',
+      ],
+    }
+  ],
+  'HEADERS': [
+    {
+      'DEST': 'include/zlib',
+      'FILES': [
+        'crc32.h',
+        'deflate.h',
+        'inffast.h',
+        'inffixed.h',
+        'inflate.h',
+        'inftrees.h',
+        'mozzconf.h',
+        'trees.h',
+        'zconf.h',
+        'zlib.h',
+        'zutil.h',
+      ],
+    },
+  ],
+  'DATA': [
+    'LICENSE',
+    'google.patch',
+    'mixed-source.patch',
+    'README.chromium',
+  ],
+  'DEST': 'src',
+  'NAME': 'zlib',
+  'EXPERIMENTAL': True,
+}
+