diff options
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | TEST_MAPPING | 18 | ||||
| -rw-r--r-- | cargo2android.json | 9 | ||||
| -rw-r--r-- | out/probe0.ll | 4 | ||||
| -rw-r--r-- | out/probe1.ll | 4 | ||||
| -rw-r--r-- | out/probe2.ll | 4 | ||||
| -rw-r--r-- | out/probe3.ll | 4 |
7 files changed, 21 insertions, 28 deletions
@@ -74,6 +74,12 @@ rust_library { "libnum_integer", "libnum_traits", ], + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], + product_available: true, + vendor_available: true, } rust_test { 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 76ddc04..bca4394 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,9 +1,14 @@ { + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], "cfg-blocklist": [ "use_addcarry" ], "copy-out": true, "device": true, "run": true, - "tests": true -}
\ No newline at end of file + "tests": true, + "vendor-available": true +} 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" |