Merge 1d8d3995a2c4e6adb7e86387823dc7538b29b476 on remote branch
Change-Id: I91a051a51f7cfdb3761d988cdf3cc26ddf848723
diff --git a/Android.bp b/Android.bp
index 53fe4fc..1ca2639 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies --device --patch=patches/Android.bp.patch.
+// This file is generated by cargo2android.py --config cargo2android.json.
+// Do not modify this file as changes will be overridden on upgrade.
package {
default_applicable_licenses: ["external_rust_crates_num_cpus_license"],
@@ -47,9 +48,11 @@
],
apex_available: [
"//apex_available:platform",
+ "com.android.resolv",
"com.android.virt",
],
+ min_sdk_version: "29",
}
// dependent_library ["feature_list"]
-// libc-0.2.81 "default,std"
+// libc-0.2.94 "default,std"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..01465d0
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,11 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.resolv",
+ "com.android.virt"
+ ],
+ "min_sdk_version": "29",
+ "dependencies": true,
+ "device": true,
+ "run": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index 968209d..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 5c46750..fd8d3d0 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -9,6 +9,10 @@ rust_library {
- rustlibs: [
- "liblibc",
- ],
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.virt",
-+ ],
- }
-
- // dependent_library ["feature_list"]