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

Pass --no-default-features to cargo build

Browse Source 
* When --features is specified,
  pass --no-default-features to cargo.
* When a dependent Rust package is imported to AOSP,
  if not all "default" features are needed, run
  cargo2android.py with empty or a list of specific features.

Test: cargo2android.py --run # use default features
Test: cargo2android.py --run --features=''  # no default
Test: cargo2android.py --run --features='default,std'
Change-Id: I854f1ecb7d7466490ff34e229ec14a07c1273c6d
This commit is contained in:
Chih-Hung Hsieh
2020-03-30 18:28:52 -07:00
parent e95677343a
commit 6c8d52f6eb
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/cargo2android.py
View File

@@ -876,8 +876,11 @@ class Runner(object):
cmd_tail = ' --target-dir ' + TARGET_TMP + ' >> cargo.out 2>&1' cmd_tail = ' --target-dir ' + TARGET_TMP + ' >> cargo.out 2>&1'
for c in self.cargo: for c in self.cargo:
features = '' features = ''
if self.args.features and c != 'clean': if c != 'clean':
features = ' --features ' + self.args.features if self.args.features is not None:
features = ' --no-default-features'
if self.args.features:
features += ' --features ' + self.args.features
cmd = 'cargo -vv ' if self.args.vv else 'cargo -v ' cmd = 'cargo -vv ' if self.args.vv else 'cargo -v '
cmd += c + features + cmd_tail cmd += c + features + cmd_tail
if self.args.rustflags and c != 'clean': if self.args.rustflags and c != 'clean':
@@ -1076,7 +1079,9 @@ def parse_args():
default=False, default=False,
help='run cargo also for a default device target') help='run cargo also for a default device target')
parser.add_argument( parser.add_argument(
'--features', type=str, help='passing features to cargo build') '--features', type=str,
help=('pass features to cargo build, ' +
'empty string means no default features'))
parser.add_argument( parser.add_argument(
'--onefile', '--onefile',
action='store_true', action='store_true',