diff options
| -rwxr-xr-x | build.py | 18 | ||||
| -rw-r--r-- | floss/build/Dockerfile | 6 |
2 files changed, 22 insertions, 2 deletions
@@ -69,6 +69,7 @@ USE_DEFAULTS = { VALID_TARGETS = [ 'all', # All targets except test and clean + 'bloat', # Check bloat of crates 'clean', # Clean up output directory 'docs', # Build Rust docs 'hosttools', # Build the host tools (i.e. packetgen) @@ -148,7 +149,7 @@ REQUIRED_APT_PACKAGES = [ ] # List of cargo packages required for linux build -REQUIRED_CARGO_PACKAGES = ['cxxbridge-cmd', 'pdl-compiler'] +REQUIRED_CARGO_PACKAGES = ['cxxbridge-cmd', 'pdl-compiler', 'grpcio-compiler', 'cargo-bloat'] APT_PKG_LIST = ['apt', '-qq', 'list'] CARGO_PKG_LIST = ['cargo', 'install', '--list'] @@ -249,6 +250,8 @@ class HostBuild(): 'link-arg=-Wl,--allow-multiple-definition', # exclude uninteresting warnings '-A improper_ctypes_definitions -A improper_ctypes -A unknown_lints', + '-Cstrip=debuginfo', + '-Copt-level=z', ] return ' '.join(rust_flags) @@ -570,6 +573,17 @@ class HostBuild(): print('Tarball created at {}'.format(tar_location)) + def _target_bloat(self): + """Run cargo bloat on workspace. + """ + crate_paths = [ + os.path.join(self.platform_dir, 'bt', 'system', 'gd', 'rust', 'linux', 'mgmt'), + os.path.join(self.platform_dir, 'bt', 'system', 'gd', 'rust', 'linux', 'service'), + os.path.join(self.platform_dir, 'bt', 'system', 'gd', 'rust', 'linux', 'client') + ] + for crate in crate_paths: + self.run_command('bloat', ['cargo', 'bloat', '--release', '--crates', '--wide'], cwd=crate, env=self.env) + def _target_clean(self): """ Delete the output directory entirely. """ @@ -624,6 +638,8 @@ class HostBuild(): self._target_install() elif self.target == 'utils': self._target_utils() + elif self.target == 'bloat': + self._target_bloat() elif self.target == 'all': self._target_all() diff --git a/floss/build/Dockerfile b/floss/build/Dockerfile index 2e0f3a3241..23ec4cbc07 100644 --- a/floss/build/Dockerfile +++ b/floss/build/Dockerfile @@ -67,7 +67,11 @@ RUN /tmp/rustup.sh -y --default-toolchain 1.77.1 ENV PATH="/root/.cargo/bin:${PATH}" # Install cargo packages required on build image. -RUN cargo install --locked cxxbridge-cmd@1.0.94 pdl-compiler@0.1.1 grpcio-compiler@0.13.0 +RUN cargo install --locked \ + cxxbridge-cmd@1.0.94 \ + pdl-compiler@0.1.1 \ + grpcio-compiler@0.13.0 \ + cargo-bloat@0.12.1 RUN cargo install --git https://android.googlesource.com/platform/build#8f9ca807 aconfig # Rename llvm packages. By default, they are named 11vm-ar-13, etc. which won't |