Snap for 10453563 from 34045888f7317b8e9a5ae41f63fcf74057f6d45e to mainline-conscrypt-release
Change-Id: I45284f053754c23e995e013d159a945ec926fe5d
diff --git a/Android.bp b/Android.bp
index 383d847..f0978cd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -74,6 +74,11 @@
"libnum_integer",
"libnum_traits",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
+ product_available: true,
vendor_available: true,
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 8088cd8..0a8b0db 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -7,15 +7,6 @@
],
"presubmit": [
{
- "name": "libapkverify.integration_test"
- },
- {
- "name": "libapkverify.test"
- },
- {
- "name": "microdroid_manager_test"
- },
- {
"name": "num-bigint_test_src_lib"
},
{
@@ -45,15 +36,6 @@
],
"presubmit-rust": [
{
- "name": "libapkverify.integration_test"
- },
- {
- "name": "libapkverify.test"
- },
- {
- "name": "microdroid_manager_test"
- },
- {
"name": "num-bigint_test_src_lib"
},
{
diff --git a/cargo2android.json b/cargo2android.json
index 16de8f8..bca4394 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,4 +1,8 @@
{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
"cfg-blocklist": [
"use_addcarry"
],
diff --git a/out/probe0.ll b/out/probe0.ll
index 75980c5..32a1844 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.77f1aead-cgu.0'
+source_filename = "probe0.77f1aead-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..b46361b 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.75b01371-cgu.0'
+source_filename = "probe1.75b01371-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..0115ea8 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.07e5c90d-cgu.0'
+source_filename = "probe2.07e5c90d-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..c9fa5aa 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.f9c981a2-cgu.0'
+source_filename = "probe3.f9c981a2-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"
