drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use soong_ui directly, instead of make

Browse Source 
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
This commit is contained in:
Dan Willemsen
2017-10-17 17:46:41 -07:00
parent 154535317e
commit a40118d7b6
4 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tools/bit/make.cpp
View File

@ -36,31 +36,16 @@ using namespace std;
map<string,string> g_buildVars;
static unsigned int
get_thread_count()
{
unsigned int threads = std::thread::hardware_concurrency();
// Guess if the value cannot be computed
return threads == 0 ? 4 : static_cast<unsigned int>(threads * 1.3f);
}
string
get_build_var(const string& buildTop, const string& name, bool quiet)
get_build_var(const string& name, bool quiet)
{
int err;
map<string,string>::iterator it = g_buildVars.find(name);
if (it == g_buildVars.end()) {
Command cmd("make");
cmd.AddArg("--no-print-directory");
cmd.AddArg(string("-j") + std::to_string(get_thread_count()));
cmd.AddArg("-C");
cmd.AddArg(buildTop);
cmd.AddArg("-f");
cmd.AddArg("build/core/config.mk");
cmd.AddArg(string("dumpvar-") + name);
cmd.AddEnv("CALLED_FROM_SETUP", "true");
cmd.AddEnv("BUILD_SYSTEM", "build/core");
Command cmd("build/soong/soong_ui.bash");
cmd.AddArg("--dumpvar-mode");
cmd.AddArg(name);
string output = trim(get_command_output(cmd, &err, quiet));
if (err == 0) {
@ -208,10 +193,8 @@ read_modules(const string& buildOut, const string& device, map<string,Module>* r
int
build_goals(const vector<string>& goals)
{
Command cmd("make");
cmd.AddArg(string("-j") + std::to_string(get_thread_count()));
cmd.AddArg("-f");
cmd.AddArg("build/core/main.mk");
Command cmd("build/soong/soong_ui.bash");
cmd.AddArg("--make-mode");
for (size_t i=0; i<goals.size(); i++) {
cmd.AddArg(goals[i]);
}