DoH: Factor dependencies to a single list

Bug: 202081046
Change-Id: I4fd4c57a6b3041ad3c03bfbf0761f93a0792c8ce

1 files changed, 15 insertions, 36 deletions

diff --git a/Android.bp b/Android.bp
index 0e06c335..54782738 100644
--- a/Android.bp
+++ b/Android.bp
@@ -323,24 +323,25 @@ filegroup {
     ],
 }
 
+doh_rust_deps = [
+    "libandroid_logger",
+    "libanyhow",
+    "libbase64_rust",
+    "libfutures",
+    "liblibc",
+    "liblog_rust",
+    "libring",
+    "libtokio",
+    "liburl",
+]
+
 rust_ffi_static {
     name: "libdoh_ffi",
     crate_name: "doh",
     srcs: ["doh/doh.rs"],
     edition: "2018",
 
-    rlibs: [
-        "libandroid_logger",
-        "libanyhow",
-        "libbase64_rust",
-        "libfutures",
-        "liblibc",
-        "liblog_rust",
-        "libquiche",
-        "libring",
-        "libtokio",
-        "liburl",
-    ],
+    rlibs: doh_rust_deps + ["libquiche"],
     prefer_rlib: true,
 
     shared_libs: [
@@ -365,18 +366,7 @@ rust_test {
     // Used to enable root permission for the test.
     // TODO: remove after 'require_root' is supported in rust_test.
     test_config_template: ":resolv_rust_test_config_template",
-    rustlibs: [
-        "libandroid_logger",
-        "libanyhow",
-        "libbase64_rust",
-        "libfutures",
-        "liblibc",
-        "liblog_rust",
-        "libquiche_static",
-        "libring",
-        "libtokio",
-        "liburl",
-    ],
+    rustlibs: doh_rust_deps + ["libquiche_static"],
     min_sdk_version: "29",
 }
 
@@ -387,18 +377,7 @@ rust_ffi_static {
     srcs: ["doh/doh.rs"],
     edition: "2018",
 
-    rlibs: [
-        "libandroid_logger",
-        "libanyhow",
-        "libbase64_rust",
-        "libfutures",
-        "liblibc",
-        "liblog_rust",
-        "libquiche_static",
-        "libring",
-        "libtokio",
-        "liburl",
-    ],
+    rlibs: doh_rust_deps + ["libquiche_static"],
     prefer_rlib: true,
     // TODO(b/194022174), for unit tests to run on the Android 10 platform,
     // libunwind must be statically linked.