aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Scull <ascull@google.com>2022-06-07 16:45:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-07 16:45:15 +0000
commitca97c1ce3e85149339bcf4d5ecd06ec3f43f2e78 (patch)
tree4030042c2c869e4908939d0a54f13d15743a9f6a
parentc812f91dafaf2dd71a37c7cfcee33a700d906b5e (diff)
parentb3e66d1204a6f533f36b79d98d6c4601b4de2fa6 (diff)
downloadnum-bigint-ca97c1ce3e85149339bcf4d5ecd06ec3f43f2e78.tar.gz
Merge "Make availble to com.android.virt" am: e6bbb82fad am: 5b729bf06b am: 4bd81ef88f am: b3e66d1204
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num-bigint/+/2113444 Change-Id: Iea93a2b70affe911fdd17606f106773b878889c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json6
-rw-r--r--out/probe0.ll4
-rw-r--r--out/probe1.ll4
-rw-r--r--out/probe2.ll4
-rw-r--r--out/probe3.ll4
6 files changed, 17 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index 1a9fd3f..3e4acf9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -74,6 +74,10 @@ rust_library {
"libnum_integer",
"libnum_traits",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
rust_test {
diff --git a/cargo2android.json b/cargo2android.json
index 76ddc04..2e7d7a7 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,4 +1,8 @@
{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
"cfg-blocklist": [
"use_addcarry"
],
@@ -6,4 +10,4 @@
"device": true,
"run": true,
"tests": true
-} \ No newline at end of file
+}
diff --git a/out/probe0.ll b/out/probe0.ll
index 75980c5..4ed8cf6 100644
--- a/out/probe0.ll
+++ b/out/probe0.ll
@@ -1,5 +1,5 @@
-; ModuleID = 'probe0.990c8f4d-cgu.0'
-source_filename = "probe0.990c8f4d-cgu.0"
+; ModuleID = 'probe0.7dfa98f6-cgu.0'
+source_filename = "probe0.7dfa98f6-cgu.0"
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
diff --git a/out/probe1.ll b/out/probe1.ll
index c92f43c..2822fb9 100644
--- a/out/probe1.ll
+++ b/out/probe1.ll
@@ -1,5 +1,5 @@
-; ModuleID = 'probe1.84fcdf3f-cgu.0'
-source_filename = "probe1.84fcdf3f-cgu.0"
+; ModuleID = 'probe1.49aa193e-cgu.0'
+source_filename = "probe1.49aa193e-cgu.0"
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
diff --git a/out/probe2.ll b/out/probe2.ll
index a286ca1..8da7d24 100644
--- a/out/probe2.ll
+++ b/out/probe2.ll
@@ -1,5 +1,5 @@
-; ModuleID = 'probe2.c1d38c83-cgu.0'
-source_filename = "probe2.c1d38c83-cgu.0"
+; ModuleID = 'probe2.2b8944cb-cgu.0'
+source_filename = "probe2.2b8944cb-cgu.0"
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
diff --git a/out/probe3.ll b/out/probe3.ll
index 48c0ad3..d924b14 100644
--- a/out/probe3.ll
+++ b/out/probe3.ll
@@ -1,5 +1,5 @@
-; ModuleID = 'probe3.4a60c962-cgu.0'
-source_filename = "probe3.4a60c962-cgu.0"
+; ModuleID = 'probe3.253fb74c-cgu.0'
+source_filename = "probe3.253fb74c-cgu.0"
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"