Bug 1216318, Get NSS ready for android, groundwork for c++, r=kaie
authorMartin Thomson <martin.thomson@gmail.com>
Thu, 22 Oct 2015 19:18:20 +0200
changeset 11694 311b58f69300da0f5442556575ef7607d2149ec7
parent 11693 a6164e360845ecad34ac11180bbf4025ab748fc4
child 11695 44d431c47dcc4d389effeb58b32de52e71325751
push id835
push userkaie@kuix.de
push dateThu, 22 Oct 2015 17:18:59 +0000
reviewerskaie
bugs1216318
Bug 1216318, Get NSS ready for android, groundwork for c++, r=kaie
coreconf/Linux.mk
--- a/coreconf/Linux.mk
+++ b/coreconf/Linux.mk
@@ -31,19 +31,22 @@ ifndef ANDROID_TOOLCHAIN_VERSION
 endif
 	ANDROID_PREFIX=$(OS_TEST)-linux-androideabi
 	ANDROID_TARGET=$(ANDROID_PREFIX)-$(ANDROID_TOOLCHAIN_VERSION)
 	# should autodetect which linux we are on, currently android only
 	# supports linux-x86 prebuilts
 	ANDROID_TOOLCHAIN=$(ANDROID_NDK)/toolchains/$(ANDROID_TARGET)/prebuilt/linux-x86
 	ANDROID_SYSROOT=$(ANDROID_NDK)/platforms/android-$(OS_TARGET_RELEASE)/arch-$(OS_TEST)
 	ANDROID_CC=$(ANDROID_TOOLCHAIN)/bin/$(ANDROID_PREFIX)-gcc
+	ANDROID_CCC=$(ANDROID_TOOLCHAIN)/bin/$(ANDROID_PREFIX)-g++
+        NSS_DISABLE_GTESTS=1
 # internal tools need to be built with the native compiler
 ifndef INTERNAL_TOOLS
 	CC = $(ANDROID_CC) --sysroot=$(ANDROID_SYSROOT)
+	CCC = $(ANDROID_CCC) --sysroot=$(ANDROID_SYSROOT)
 	DEFAULT_COMPILER=$(ANDROID_PREFIX)-gcc
 	ARCHFLAG = --sysroot=$(ANDROID_SYSROOT)
 	DEFINES += -DNO_SYSINFO -DNO_FORK_CHECK -DANDROID
 	CROSS_COMPILE = 1
 endif
 endif
 ifeq (,$(filter-out ppc64 ppc64le,$(OS_TEST)))
 	CPU_ARCH	= ppc