diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-10-18 06:24:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-18 06:24:45 +0000 |
| commit | bfc9e71e0d851204d9f0f380b7f2def51875b657 (patch) | |
| tree | bbf5e93eba810ecde5f2c0cdd2303de3baf03549 /tools/bit/main.cpp | |
| parent | f60d30b6829b84223c680b7b6f9669975c708a27 (diff) | |
| parent | 98fc198f1fe4236f8b9fd159636c4386ead0dc35 (diff) | |
Merge "Use soong_ui directly, instead of make" am: e994b4b584 am: 0531e5c647
am: 98fc198f1f
Change-Id: Id17adee4b02cc499261f88c3faed15d889f5b6c3
Diffstat (limited to 'tools/bit/main.cpp')
| -rw-r--r-- | tools/bit/main.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/bit/main.cpp b/tools/bit/main.cpp index a8a4cfcab351..a71cea1c44f9 100644 --- a/tools/bit/main.cpp +++ b/tools/bit/main.cpp @@ -623,12 +623,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); |