diff --git a/Android.bp b/Android.bp
index e6745b9..bc52b63 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,6 +3,7 @@
 rust_defaults {
     name: "cfg-if_defaults",
     crate_name: "cfg_if",
+    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
@@ -11,18 +12,17 @@
 rust_test_host {
     name: "cfg-if_host_test_src_lib",
     defaults: ["cfg-if_defaults"],
-    srcs: ["src/lib.rs"],
 }
 
 rust_test {
     name: "cfg-if_device_test_src_lib",
     defaults: ["cfg-if_defaults"],
-    srcs: ["src/lib.rs"],
 }
 
 rust_defaults {
     name: "cfg-if_defaults_xcrate",
     crate_name: "xcrate",
+    srcs: ["tests/xcrate.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
@@ -34,13 +34,11 @@
 rust_test_host {
     name: "cfg-if_host_test_tests_xcrate",
     defaults: ["cfg-if_defaults_xcrate"],
-    srcs: ["tests/xcrate.rs"],
 }
 
 rust_test {
     name: "cfg-if_device_test_tests_xcrate",
     defaults: ["cfg-if_defaults_xcrate"],
-    srcs: ["tests/xcrate.rs"],
 }
 
 rust_library {
diff --git a/METADATA b/METADATA
index 25d93f5..9ac882d 100644
--- a/METADATA
+++ b/METADATA
@@ -6,8 +6,8 @@
     value: "https://crates.io/crates/cfg-if"
   }
   url {
-    type: GIT
-    value: "https://github.com/alexcrichton/cfg-if"
+    type: ARCHIVE
+    value: "https://static.crates.io/crates/cfg-if/cfg-if-0.1.10.crate"
   }
   version: "0.1.10"
   license_type: NOTICE
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 76e728e..6eef097 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,3 +1,4 @@
+// Generated by cargo2android.py for tests in Android.bp
 {
   "presubmit": [
     {
@@ -5,11 +6,11 @@
       "host": true
     },
     {
-      "name": "cfg-if_host_test_tests_xcrate",
-      "host": true
+      "name": "cfg-if_device_test_src_lib"
     },
     {
-      "name": "cfg-if_device_test_src_lib"
+      "name": "cfg-if_host_test_tests_xcrate",
+      "host": true
     },
     {
       "name": "cfg-if_device_test_tests_xcrate"