Merge "Compile bit on darwin, use -j when invoking make" (4391fae3) · Commits · e / os / android_frameworks_base

tools/bit/Android.mk

+1 −3

Original line number	Diff line number	Diff line
		@@ -22,8 +22,7 @@ include $(CLEAR_VARS)

		LOCAL_MODULE := bit

		# This tool doesn't build on darwin.
		LOCAL_MODULE_HOST_OS := linux
		LOCAL_MODULE_HOST_OS := linux darwin

		LOCAL_SRC_FILES := \
		aapt.cpp \
		@@ -43,4 +42,3 @@ LOCAL_SHARED_LIBRARIES := \
		libprotobuf-cpp-full

		include $(BUILD_HOST_EXECUTABLE)

+11 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		#include <fstream>
		#include <string>
		#include <map>
		#include <thread>

		#include <sys/types.h>
		#include <dirent.h>
		@@ -35,6 +36,14 @@ 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)
		{
		@@ -44,6 +53,7 @@ get_build_var(const string& buildTop, const string& name, bool quiet)
		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");
		@@ -199,6 +209,7 @@ 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");
		for (size_t i=0; i<goals.size(); i++) {