From a18bd3c1ca792d39bc52d42808af29ea669377e9 Mon Sep 17 00:00:00 2001 From: Jeongik Cha Date: Wed, 27 Sep 2023 02:28:55 +0900 Subject: [PATCH] Set _available only if it is for device it is meaningful only if it is installed in the device Bug: 277909042 Test: cargo2android.py with/without device, and then check product/vendor_available Change-Id: I9ca7328ac953849db224949089412e181b659945 --- scripts/cargo2android.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/scripts/cargo2android.py b/scripts/cargo2android.py index a0fa65d56..7bb1cc5cf 100755 --- a/scripts/cargo2android.py +++ b/scripts/cargo2android.py @@ -744,18 +744,20 @@ class Crate(object): self.write(' "libcompiler_builtins.rust_sysroot",') self.write(' "libcore.rust_sysroot",') self.write(' ],') - if self.runner.variant_args.native_bridge_supported: - self.write(' native_bridge_supported: true,') - if self.runner.variant_args.product_available: - self.write(' product_available: true,') - if self.runner.variant_args.recovery_available: - self.write(' recovery_available: true,') - if self.runner.variant_args.vendor_available: - self.write(' vendor_available: true,') - if self.runner.variant_args.vendor_ramdisk_available: - self.write(' vendor_ramdisk_available: true,') - if self.runner.variant_args.ramdisk_available: - self.write(' ramdisk_available: true,') + if self.device_supported: + # These configurations are meaningful only if it is for device. + if self.runner.variant_args.native_bridge_supported: + self.write(' native_bridge_supported: true,') + if self.runner.variant_args.product_available: + self.write(' product_available: true,') + if self.runner.variant_args.recovery_available: + self.write(' recovery_available: true,') + if self.runner.variant_args.vendor_available: + self.write(' vendor_available: true,') + if self.runner.variant_args.vendor_ramdisk_available: + self.write(' vendor_ramdisk_available: true,') + if self.runner.variant_args.ramdisk_available: + self.write(' ramdisk_available: true,') if self.runner.variant_args.min_sdk_version and crate_type in LIBRARY_CRATE_TYPES and self.device_supported: self.write(' min_sdk_version: "%s",' % self.runner.variant_args.min_sdk_version) if crate_type == 'test' and not self.default_srcs: