update nspr to NSPR_HEAD_20100330 to pick up support for android r=ted

--HG-- extra : rebase_source : 90577e9e3385b0d866e4860e0c6c89bfe382881e
dothq · Mar 30, 2010 · 43da54b · 43da54b
1 parent f5937dc
commit 43da54b
Show file tree

Hide file tree

Showing 20 changed files with 583 additions and 244 deletions.
diff --git a/nsprpub/config/autoconf.mk.in b/nsprpub/config/autoconf.mk.in
@@ -35,8 +35,10 @@ MOD_PATCH_VERSION = @MOD_PATCH_VERSION@
 LIBNSPR		= @LIBNSPR@
 LIBPLC		= @LIBPLC@
 
-CROSS_COMPILE	= @CROSS_COMPILE@
-BUILD_OPT	= @MOZ_OPTIMIZE@
+CROSS_COMPILE		= @CROSS_COMPILE@
+BUILD_OPT			= @MOZ_OPTIMIZE@
+MOZ_DEBUG			= @MOZ_DEBUG@
+MOZ_DEBUG_SYMBOLS	= @MOZ_DEBUG_SYMBOLS@
 
 USE_CPLUS	= @USE_CPLUS@
 USE_IPV6	= @USE_IPV6@

diff --git a/nsprpub/config/rules.mk b/nsprpub/config/rules.mk
@@ -141,7 +141,7 @@ endif
 ifndef TARGETS
 ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
 TARGETS		= $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
-ifndef BUILD_OPT
+ifdef MOZ_DEBUG_SYMBOLS
 ifdef MSC_VER
 ifneq (,$(filter-out 1100 1200,$(MSC_VER)))
 TARGETS		+= $(SHARED_LIB_PDB)