Build quiche both as an rlib and as an ffi lib. am: 55399b5e6d am: 65f639a695
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/1531538
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2c5f1080df94294288074b57e65b85ea30a2e6e6
diff --git a/Android.bp b/Android.bp
index 30f962d..f828c7d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -10,8 +10,8 @@
min_sdk_version: "29",
}
-rust_ffi {
- name: "libquiche_ffi",
+rust_defaults {
+ name: "libquiche_defaults",
stem: "libquiche",
host_supported: true,
crate_name: "quiche",
@@ -45,6 +45,16 @@
min_sdk_version: "29",
}
+rust_ffi {
+ name: "libquiche_ffi",
+ defaults: ["libquiche_defaults"],
+}
+
+rust_library {
+ name: "libquiche",
+ defaults: ["libquiche_defaults"],
+}
+
// dependent_library ["feature_list"]
// cc-1.0.66
// cfg-if-0.1.10
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index 28dd4c8..5a4dc0d 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -1,6 +1,6 @@
---- Android.bp 2020-12-14 20:39:12.756511927 +0900
-+++ Android.bp.new 2020-12-14 20:27:28.268899533 +0900
-@@ -1,74 +1,48 @@
+--- Android.bp 2020-12-16 14:02:37.120186423 +0900
++++ Android.bp.new 2020-12-15 22:43:09.717301330 +0900
+@@ -1,74 +1,58 @@
// This file is generated by cargo2android.py --run --device --dependencies --patch=patches/Android.bp.patch.
-rust_library_shared {
@@ -36,8 +36,8 @@
-rust_library {
- name: "libquiche",
-+rust_ffi {
-+ name: "libquiche_ffi",
++rust_defaults {
++ name: "libquiche_defaults",
+ stem: "libquiche",
host_supported: true,
crate_name: "quiche",
@@ -94,6 +94,16 @@
+ "com.android.resolv",
],
+ min_sdk_version: "29",
++}
++
++rust_ffi {
++ name: "libquiche_ffi",
++ defaults: ["libquiche_defaults"],
++}
++
++rust_library {
++ name: "libquiche",
++ defaults: ["libquiche_defaults"],
}
// dependent_library ["feature_list"]
