external/nss/nss-android.patch.1

   1 diff -ur nss.org/nspr/build/autoconf/config.sub nss/nspr/build/autoconf/config.sub
   2 --- nss.org/nspr/build/autoconf/config.sub      2017-09-07 15:29:45.031246453 +0200
   3 +++ nss/nspr/build/autoconf/config.sub  2017-09-07 15:32:13.087235423 +0200
   4 @@ -111,6 +111,9 @@
   5      exit 1;;
   6  esac
   7
   8 +if test $1 = "arm-unknown-linux-androideabi"; then echo $1; exit; fi
   9 +if test $1 = "i686-pc-linux-android"; then echo $1; exit; fi
  10 +
  11  # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
  12  # Here we must recognize all the valid KERNEL-OS combinations.
  13  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  14 diff -ur nss.org/nspr/configure nss/nspr/configure
  15 --- nss.org/nspr/configure      2017-09-07 15:29:45.018246359 +0200
  16 +++ nss/nspr/configure  2017-09-07 15:31:47.604075663 +0200
  17 @@ -2737,18 +2739,15 @@
  18      esac
  19
  20          AS="$android_toolchain"/bin/"$android_tool_prefix"-as
  21 -    CC="$android_toolchain"/bin/"$android_tool_prefix"-gcc
  22 -    CXX="$android_toolchain"/bin/"$android_tool_prefix"-g++
  23 -    CPP="$android_toolchain"/bin/"$android_tool_prefix"-cpp
  24 +    CC="$CC"
  25 +    CXX="$CXX"
  26 +    CPP="$CC" -E
  27      LD="$android_toolchain"/bin/"$android_tool_prefix"-ld
  28      AR="$android_toolchain"/bin/"$android_tool_prefix"-ar
  29      RANLIB="$android_toolchain"/bin/"$android_tool_prefix"-ranlib
  30      STRIP="$android_toolchain"/bin/"$android_tool_prefix"-strip
  31
  32      CPPFLAGS="-I$android_platform/usr/include $CPPFLAGS"
  33 -    CFLAGS="-mandroid -I$android_platform/usr/include -fno-short-enums -fno-exceptions $CFLAGS"
  34 -    CXXFLAGS="-mandroid -I$android_platform/usr/include -fpic -fno-short-enums -fno-exceptions $CXXFLAGS"
  35 -    LDFLAGS="-mandroid -L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform $LDFLAGS"
  36
  37      $as_echo "#define ANDROID 1" >>confdefs.h
  38
  39 diff -ur nss.org/nss/Makefile nss/nss/Makefile
  40 --- nss.org/nss/Makefile        2017-09-07 15:29:44.933245745 +0200
  41 +++ nss/nss/Makefile    2017-09-07 15:32:04.347181076 +0200
  42 @@ -62,6 +62,6 @@
  43  ifeq ($(OS_TARGET),Android)
  44  NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) \
  45 -                       --target=$(ANDROID_PREFIX) \
  46 +                       --with-arch=toolchain-default \
  47                         --with-android-version=$(OS_TARGET_RELEASE) \
  48                         --with-android-toolchain=$(ANDROID_TOOLCHAIN) \
  49                         --with-android-platform=$(ANDROID_SYSROOT)
  50 unified headers / ndk16 does have it in it's support module