LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes I78bc86ad,Ieeab8376 am: 16ed4a3cc3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/2215842

Change-Id: I5b7bee417d614ecf6994b0eafd84934ac919891d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matthew Maurer
2022-09-14 15:08:07 +00:00
committed by Automerger Merge Worker
parent ca55840d51 16ed4a3cc3
commit d0d91303e2
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/cargo2android.py
View File

@@ -43,8 +43,6 @@ If there are rustc warning messages, this script will add
a warning comment to the owner crate module in Android.bp. a warning comment to the owner crate module in Android.bp.
""" """
from __future__ import print_function
import argparse import argparse
import glob import glob
import json import json
@@ -58,7 +56,7 @@ import sys
# Some Rust packages include extra unwanted crates. # Some Rust packages include extra unwanted crates.
# This set contains all such excluded crate names. # This set contains all such excluded crate names.
EXCLUDED_CRATES = set(['protobuf_bin_gen_rust_do_not_use']) EXCLUDED_CRATES = {'protobuf_bin_gen_rust_do_not_use'}
RENAME_MAP = { RENAME_MAP = {
# This map includes all changes to the default rust module names # This map includes all changes to the default rust module names
@@ -1547,7 +1545,7 @@ class Runner(object):
return '' return ''
def add_empty_test(self, name): def add_empty_test(self, name):
if name == 'unittests': if name.startswith('unittests'):
self.empty_unittests = True self.empty_unittests = True
else: else:
self.empty_tests.add(name) self.empty_tests.add(name)