Strip before patching, otherwise the libraries may be corrupted

Author: mhsmith

android-env.sh

@@ -78,11 +78,7 @@ fi
 
 if [ -n "${PREFIX:-}" ]; then
     abs_prefix=$(realpath $PREFIX)
-
-    # Use -idirafter so that package-specified -I directories take priority. For
-    # example, grpcio provides its own BoringSSL headers which must be used rather than
-    # our OpenSSL.
-    CFLAGS="$CFLAGS -idirafter $abs_prefix/include"
+    CFLAGS="$CFLAGS -I$abs_prefix/include"
     LDFLAGS="$LDFLAGS -L$abs_prefix/lib"
 
     export PKG_CONFIG="pkg-config --define-prefix"

openssl/build.sh

@@ -54,6 +54,11 @@ rm -r $prefix/usr
 cd $prefix/lib
 for name in crypto ssl; do
     old_name=$(basename $(realpath lib$name.so))  # Follow symlinks.
+
+    # Strip before patching, otherwise the libraries may be corrupted:
+    # https://github.com/NixOS/patchelf/issues?q=is%3Aissue+strip+in%3Atitle
+    "$STRIP" "$old_name"
+
     new_name="lib${name}_python.so"
     if [ "$name" = "crypto" ]; then
         crypto_old_name=$old_name

sqlite/build.sh

@@ -43,6 +43,11 @@ make install prefix=$prefix
 cd $prefix/lib
 for name in sqlite3; do
     old_name=$(basename $(realpath lib$name.so))  # Follow symlinks.
+
+    # Strip before patching, otherwise the libraries may be corrupted:
+    # https://github.com/NixOS/patchelf/issues?q=is%3Aissue+strip+in%3Atitle
+    "$STRIP" "$old_name"
+
     new_name="lib${name}_python.so"
     mv "$old_name" "$new_name"
     ln -s "$new_name" "$old_name"