From 41728e2a7b9361219a8ad00d8c6ba6726c54f31e Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Thu, 16 Nov 2023 14:31:05 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: Id487adb7de19f2179863fea27d466edc25ddeb0f --- Android.bp | 2 +- cargo2android.json | 12 ------------ cargo_embargo.json | 11 +++++++++++ 3 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 72288cb..a1853db 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 e6792f4..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "//apex_available:anyapex" - ], - "copy-out": true, - "dependencies": true, - "device": true, - "features": "bytes", - "min-sdk-version": "29", - "run": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..89530e3 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,11 @@ +{ + "features": [ + "bytes" + ], + "min_sdk_version": "29", + "package": { + "protobuf": { + "copy_out": true + } + } +} -- cgit v1.2.3