diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-18 02:14:56 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-18 02:14:56 +0000 |
commit | a6b4fae0d89ad1a022f0a54d678abb4587a3a2e6 (patch) | |
tree | 51e1e2a56037b1e941ba0a4be67ea12d1baba635 | |
parent | 6d511e7bda10da47234174af56f5e4ab13c85519 (diff) | |
parent | 19f93951a58c6a26b3bee63a359fe2bc9c08d61b (diff) | |
download | untrusted-android14-qpr2-s2-release.tar.gz |
Snap for 11117647 from 19f93951a58c6a26b3bee63a359fe2bc9c08d61b to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Change-Id: I5af15b9ee27c32abc37622db9a18cb53a31169a9
-rw-r--r-- | Android.bp | 8 | ||||
-rw-r--r-- | cargo_embargo.json (renamed from cargo2android.json) | 9 |
2 files changed, 5 insertions, 12 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --config cargo2android.json. +// This file is generated by cargo_embargo. // Do not modify this file as changes will be overridden on upgrade. package { @@ -20,7 +20,6 @@ license { rust_library { name: "libuntrusted", - // has rustc warnings host_supported: true, crate_name: "untrusted", cargo_env_compat: true, @@ -40,7 +39,6 @@ rust_library { rust_test { name: "untrusted_test_tests_tests", - // has rustc warnings host_supported: true, crate_name: "tests", cargo_env_compat: true, @@ -52,7 +50,5 @@ rust_test { unit_test: true, }, edition: "2018", - rustlibs: [ - "libuntrusted", - ], + rustlibs: ["libuntrusted"], } diff --git a/cargo2android.json b/cargo_embargo.json index 506d866..2718013 100644 --- a/cargo2android.json +++ b/cargo_embargo.json @@ -1,13 +1,10 @@ { - "apex-available": [ + "apex_available": [ "//apex_available:platform", "com.android.compos", "com.android.resolv", "com.android.virt" ], - "dependencies": true, - "device": true, - "min-sdk-version": "29", - "run": true, + "min_sdk_version": "29", "tests": true -}
\ No newline at end of file +} |