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

Merge "Enable LTO in cargo2android.py." am: 2ed385fe16 am: e96541ec71

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

Change-Id: Icffdf9d23de7b01bbc257d014be427289143cca0
This commit is contained in:
Joel Galenson
2021-11-23 01:36:42 +00:00
committed by Automerger Merge Worker
parent a078b426d7 e96541ec71
commit f0bbaa297b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/cargo2android.py
View File

@@ -352,12 +352,14 @@ class Crate(object):
# 'prefer-dynamic' does not work with common flag -C lto # 'prefer-dynamic' does not work with common flag -C lto
# 'embed-bitcode' is ignored; we might control LTO with other .bp flag # 'embed-bitcode' is ignored; we might control LTO with other .bp flag
# 'codegen-units' is set in Android global config or by default # 'codegen-units' is set in Android global config or by default
# 'lto' is used in Android, but it's set by the build system
if not (flag.startswith('codegen-units=') or if not (flag.startswith('codegen-units=') or
flag.startswith('debuginfo=') or flag.startswith('debuginfo=') or
flag.startswith('embed-bitcode=') or flag.startswith('embed-bitcode=') or
flag.startswith('extra-filename=') or flag.startswith('extra-filename=') or
flag.startswith('incremental=') or flag.startswith('incremental=') or
flag.startswith('metadata=') or flag.startswith('metadata=') or
flag.startswith('lto=') or
flag == 'prefer-dynamic'): flag == 'prefer-dynamic'):
self.codegens.append(flag) self.codegens.append(flag)
@@ -1342,6 +1344,9 @@ class Runner(object):
# set up search PATH for cargo to find the correct rustc # set up search PATH for cargo to find the correct rustc
saved_path = os.environ['PATH'] saved_path = os.environ['PATH']
os.environ['PATH'] = os.path.dirname(self.cargo_path) + ':' + saved_path os.environ['PATH'] = os.path.dirname(self.cargo_path) + ':' + saved_path
# We need to enable lto since our test prebuilts use it
saved_rustflags = os.environ.get('RUSTFLAGS', '')
os.environ['RUSTFLAGS'] = '-C lto=thin -C embed-bitcode=yes ' + saved_rustflags
# Add [workspace] to Cargo.toml if it is not there. # Add [workspace] to Cargo.toml if it is not there.
added_workspace = False added_workspace = False
if self.args.add_workspace: if self.args.add_workspace:
@@ -1367,7 +1372,7 @@ class Runner(object):
cmd = self.cargo_path + cmd_v_flag cmd = self.cargo_path + cmd_v_flag
cmd += c + features + cmd_tail_target + cmd_tail_redir cmd += c + features + cmd_tail_target + cmd_tail_redir
if self.args.rustflags and c != 'clean': if self.args.rustflags and c != 'clean':
cmd = 'RUSTFLAGS="' + self.args.rustflags + '" ' + cmd cmd = 'RUSTFLAGS="' + os.environ['RUSTFLAGS'] + ' ' + self.args.rustflags + '" ' + cmd
self.run_cmd(cmd, cargo_out) self.run_cmd(cmd, cargo_out)
if self.args.tests: if self.args.tests:
cmd = self.cargo_path + ' test' + features + cmd_tail_target + ' -- --list' + cmd_tail_redir cmd = self.cargo_path + ' test' + features + cmd_tail_target + ' -- --list' + cmd_tail_redir
@@ -1378,6 +1383,7 @@ class Runner(object):
if self.args.verbose: if self.args.verbose:
print('### INFO: restored original Cargo.toml') print('### INFO: restored original Cargo.toml')
os.environ['PATH'] = saved_path os.environ['PATH'] = saved_path
os.environ['RUSTFLAGS'] = saved_rustflags
if not self.dry_run: if not self.dry_run:
if not had_cargo_lock: # restore to no Cargo.lock state if not had_cargo_lock: # restore to no Cargo.lock state
os.remove(cargo_lock) os.remove(cargo_lock)