1 files changed, 43 insertions, 11 deletions

diff --git a/Android.bp b/Android.bp
index 121cba8..bba5b1e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,7 +42,6 @@ license {
 rust_defaults {
     name: "crossbeam-epoch_defaults",
     crate_name: "crossbeam_epoch",
-    // has rustc warnings
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -61,7 +60,6 @@ rust_defaults {
         "librand",
         "libscopeguard",
     ],
-    proc_macros: ["libconst_fn"],
 }
 
 rust_test_host {
@@ -77,9 +75,45 @@ rust_test {
     defaults: ["crossbeam-epoch_defaults"],
 }
 
+rust_defaults {
+    name: "crossbeam-epoch_defaults_loom",
+    crate_name: "loom",
+    srcs: ["tests/loom.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    features: [
+        "alloc",
+        "default",
+        "lazy_static",
+        "std",
+    ],
+    rustlibs: [
+        "libcfg_if",
+        "libcrossbeam_epoch",
+        "libcrossbeam_utils",
+        "liblazy_static",
+        "libmemoffset",
+        "librand",
+        "libscopeguard",
+    ],
+}
+
+rust_test_host {
+    name: "crossbeam-epoch_host_test_tests_loom",
+    defaults: ["crossbeam-epoch_defaults_loom"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "crossbeam-epoch_device_test_tests_loom",
+    defaults: ["crossbeam-epoch_defaults_loom"],
+}
+
 rust_library {
     name: "libcrossbeam_epoch",
-    // has rustc warnings
     host_supported: true,
     crate_name: "crossbeam_epoch",
     srcs: ["src/lib.rs"],
@@ -97,20 +131,18 @@ rust_library {
         "libmemoffset",
         "libscopeguard",
     ],
-    proc_macros: ["libconst_fn"],
 }
 
 // dependent_library ["feature_list"]
 //   autocfg-1.0.1
 //   cfg-if-1.0.0
-//   const_fn-0.4.5
 //   crossbeam-utils-0.8.3 "lazy_static,std"
-//   getrandom-0.1.16 "std"
+//   getrandom-0.2.2 "std"
 //   lazy_static-1.4.0
-//   libc-0.2.87
-//   memoffset-0.6.1 "default"
+//   libc-0.2.92
+//   memoffset-0.6.3 "default"
 //   ppv-lite86-0.2.10 "simd,std"
-//   rand-0.7.3 "alloc,default,getrandom,getrandom_package,libc,std"
-//   rand_chacha-0.2.2 "std"
-//   rand_core-0.5.1 "alloc,getrandom,std"
+//   rand-0.8.3 "alloc,default,getrandom,libc,rand_chacha,rand_hc,std,std_rng"
+//   rand_chacha-0.3.0 "std"
+//   rand_core-0.6.2 "alloc,getrandom,std"
 //   scopeguard-1.1.0