Merge "Use soong_ui directly, instead of make"

am: e994b4b584

Change-Id: I406a02af2d5fd1accf5c53609af00f416669e18f

1 files changed, 4 insertions, 3 deletions

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<Target*> 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<string,Module> modules;
     read_modules(buildOut, buildDevice, &modules, false);