From 090bdcef9c667838291529dd13edef7910ca67c9 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Thu, 16 Nov 2023 15:49:19 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I95997fc5f1fc80428ebdcdd1262b360d991bb853 --- Android.bp | 2 +- cargo2android.json | 18 ------------------ cargo_embargo.json | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 19 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index d7efeea..af83e04 100644 --- a/Android.bp +++ b/Android.bp @@ -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 { diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index a13f256..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.runtime", - "com.android.art.debug", - "com.android.art" - ], - "device": true, - "min-sdk-version": "S", - "native-bridge-supported": true, - "product-available": true, - "ramdisk-available": true, - "recovery-available": true, - "run": true, - "tests": true, - "vendor-available": true, - "vendor-ramdisk-available": true -} \ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..f40467e --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,15 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.runtime", + "com.android.art.debug", + "com.android.art" + ], + "min_sdk_version": "S", + "native_bridge_supported": true, + "ramdisk_available": true, + "recovery_available": true, + "run_cargo": false, + "tests": true, + "vendor_ramdisk_available": true +} -- cgit v1.2.3