diff options
| author | Lukacs T. Berki <lberki@google.com> | 2021-09-01 16:25:51 +0200 |
|---|---|---|
| committer | Lukacs T. Berki <lberki@google.com> | 2021-09-02 13:35:49 +0200 |
| commit | d6cee7e37411022f2b1c37102ca0591e219969b6 (patch) | |
| tree | 241ffea6db9d921d56884243cc5015a53cecce83 /dexpreopt | |
| parent | ea1a31c07f4c84c7622da10eb1270ff5fe8f5612 (diff) | |
Make OutDir() and SoongOutDir() be consistent.
They both used to return out/soong. Unfortunately, the tests seem to
assume the old behavior, so I had to keep tests inconsistent and I was
scared of dexpreopt, too.
Test: Presubmits.
Change-Id: Ib00c7956fd2cdb28cc11d481c17e5a3ff5ad563a
Diffstat (limited to 'dexpreopt')
| -rw-r--r-- | dexpreopt/dexpreopt_gen/dexpreopt_gen.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/dexpreopt/dexpreopt_gen/dexpreopt_gen.go b/dexpreopt/dexpreopt_gen/dexpreopt_gen.go index 7dbe74c27..ba05d945d 100644 --- a/dexpreopt/dexpreopt_gen/dexpreopt_gen.go +++ b/dexpreopt/dexpreopt_gen/dexpreopt_gen.go @@ -87,7 +87,9 @@ func main() { usage("--module configuration file is required") } - ctx := &builderContext{android.NullConfig(*outDir)} + // NOTE: duplicating --out_dir here is incorrect (one should be the another + // plus "/soong" but doing so apparently breaks dexpreopt + ctx := &builderContext{android.NullConfig(*outDir, *outDir)} globalSoongConfigData, err := ioutil.ReadFile(*globalSoongConfigPath) if err != nil { |