commit 48a172754622eb4b6f8a65cd021352c3ad8453cf
author Luke Huang <huangluke@google.com> Mon Dec 09 18:26:36 2019 +0800
committer Luke Huang <huangluke@google.com> Thu Dec 12 23:16:10 2019 +0800
tree 5bd352e6d876dde024313d041356d819baed688a
parent e7d64cf3fbef77dc92177a3e283fec9fa0d27f91

Update build rules for Cronet apex

Cronet apex should contain
  1. Cronet impl jars
  2. JNI library of impl jars.

Bug: 139397529
Test: build
Change-Id: I355d57a3b3f2512b27988dde14b05ec5a84bdf54

Android.bp

diff --git a/Android.bp b/Android.bp
index e1956cc..25c284c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,7 +15,6 @@
 java_library {
     name: "cronet_impls_java",
     static_libs: [
-        "cronet_impl_platform_java",
         "cronet_impl_common_java",
         "cronet_impl_native_java",
     ],
@@ -28,25 +27,40 @@
 }
 
 java_import {
-    name: "cronet_api_java",
-    jars: ["prebuilt/cronet_api.jar"],
-}
-
-java_import {
     name: "cronet_impl_native_java",
     jars: ["prebuilt/cronet_impl_native_java.jar"],
     visibility: ["//visibility:private"],
 }
 
 java_import {
-    name: "cronet_impl_platform_java",
-    jars: ["prebuilt/cronet_impl_platform_java.jar"],
-    visibility: ["//visibility:private"],
-
-}
-
-java_import {
     name: "cronet_impl_common_java",
     jars: ["prebuilt/cronet_impl_common_java.jar"],
     visibility: ["//visibility:private"],
 }
+
+cc_prebuilt_library_shared {
+    name: "libcronet.80.0.3986.0",
+    // STOPSHIP: Confirm if it is safe
+    shared_libs: [
+        "libandroid",
+        "libc",
+        "libdl",
+        "liblog",
+        "libm",
+    ],
+    stl: "libc++_static",
+    target: {
+        android_arm64: {
+            srcs: ["prebuilt/libs/arm64-v8a/libcronet.80.0.3986.0.so"],
+        },
+        android_arm: {
+            srcs: ["prebuilt/libs/armeabi-v7a/libcronet.80.0.3986.0.so"],
+        },
+        android_x86_64: {
+            srcs: ["prebuilt/libs/x86_64/libcronet.80.0.3986.0.so"],
+        },
+        android_x86: {
+            srcs: ["prebuilt/libs/x86/libcronet.80.0.3986.0.so"],
+        },
+    },
+}

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 8b6632f..3bdb33d 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -15,6 +15,8 @@
 apex {
     name: "com.android.cronet",
     manifest: "manifest.json",
+    compile_multilib: "both",
+    native_shared_libs: ["libcronet.80.0.3986.0"],
     java_libs: ["cronet_impls_java",],
     key: "com.android.cronet.key",
     certificate: ":com.android.cronet.certificate",