Snap for 12583547 from 258158af to mainline-networking-release

Change-Id: I5a0035da749808f6469bd5aa303b6afbfbc6abe1

Android.bp

@@ -45,9 +45,11 @@ cflags_arm = [
 cflags_arm64 = cflags_arm + ["-DINFLATE_CHUNK_READ_64LE"]
 
 cflags_riscv64 = [
-    // TODO: test and enable these.
-    // "-DRISCV_RVV",
-    // "-DADLER32_SIMD_RVV",
+    "-DRISCV_RVV",
+    "-DADLER32_SIMD_RVV",
+    "-DDEFLATE_SLIDE_HASH_RVV",
+    "-DINFLATE_CHUNK_GENERIC",
+    "-DINFLATE_CHUNK_READ_64LE",
 ]
 
 // The *host* x86 configuration (with *lower* CPU feature requirements).
@@ -194,6 +196,13 @@ cc_library {
         symbol_file: "libz.map.txt",
     },
 
+    // linker/linker64 statically link zlib.
+    static: {
+        apex_available: [
+            "com.android.runtime",
+        ],
+    },
+
     // When used by Vendor/Product APEX,
     // libz should be treated like non-stable module.
     // (Hence, should be bundled in APEX).