From a40118d7b6f70f44eaf4a47a32808088fd039f71 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 17 Oct 2017 17:46:41 -0700 Subject: Use soong_ui directly, instead of make This will use ckati instead of make for dumping variables, for consistent makefile parsing. It may also sandbox executions, etc. Also skip the legacy make wrapper to build, and use soong_ui instead. The command line arguments are equivalent, but -j is no longer necessary, we'll default to a sane value. Test: bit -b framework Change-Id: Idc2c9d1abe84b6b783b8702925de5493d47a4509 --- tools/bit/main.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tools/bit/main.cpp') diff --git a/tools/bit/main.cpp b/tools/bit/main.cpp index ad23971152b2..e81898f82418 100644 --- a/tools/bit/main.cpp +++ b/tools/bit/main.cpp @@ -588,12 +588,13 @@ run_phases(vector targets, const Options& options) const string buildProduct = get_required_env("TARGET_PRODUCT", false); const string buildVariant = get_required_env("TARGET_BUILD_VARIANT", false); const string buildType = get_required_env("TARGET_BUILD_TYPE", false); - const string buildDevice = get_build_var(buildTop, "TARGET_DEVICE", false); - const string buildId = get_build_var(buildTop, "BUILD_ID", false); - const string buildOut = get_out_dir(); chdir_or_exit(buildTop.c_str()); + const string buildDevice = get_build_var("TARGET_DEVICE", false); + const string buildId = get_build_var("BUILD_ID", false); + const string buildOut = get_out_dir(); + // Get the modules for the targets map modules; read_modules(buildOut, buildDevice, &modules, false); -- cgit v1.2.3-59-g8ed1b