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

Merge "Rename rust_defaults that contain tests." am: 1353136072 am: 294f9a7129

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

Change-Id: I0ff28bf5844afc24098f3c8f15fa3a11168cbbff
This commit is contained in:
Joel Galenson
2021-07-14 16:55:51 +00:00
committed by Automerger Merge Worker
parent e9b5ec7b8d 294f9a7129
commit f5f5db8edd
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/cargo2android.py
View File

@@ -554,11 +554,12 @@ class Crate(object):
def build_default_name(self): def build_default_name(self):
"""Return a short and readable name for the rust_defaults module.""" """Return a short and readable name for the rust_defaults module."""
# Choices: (1) root_pkg + '_defaults', # Choices: (1) root_pkg + '_test'? + '_defaults',
# (2) root_pkg + '_defaults_' + crate_name # (2) root_pkg + '_test'? + '_defaults_' + crate_name
# (3) root_pkg + '_defaults_' + main_src_basename_path # (3) root_pkg + '_test'? + '_defaults_' + main_src_basename_path
# (4) root_pkg + '_defaults_' + a_positive_sequence_number # (4) root_pkg + '_test'? + '_defaults_' + a_positive_sequence_number
name1 = altered_defaults(self.root_pkg) + '_defaults' test = "_test" if self.crate_types == ['test'] else ""
name1 = altered_defaults(self.root_pkg) + test + '_defaults'
if self.runner.try_claim_module_name(name1, self): if self.runner.try_claim_module_name(name1, self):
return name1 return name1
name2 = name1 + '_' + self.crate_name name2 = name1 + '_' + self.crate_name