diff options
| author | Colin Cross <ccross@android.com> | 2019-03-04 19:27:41 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-04 19:27:41 -0800 |
| commit | 7e2b9c48ca4591770bc913112a9238e2a613b62c (patch) | |
| tree | 2e36b7a0ff0248a7358bafd40a6fe1d37fb51ee3 /java/java_test.go | |
| parent | ee3c74b4573ee4314b8f9682fe39b3cdacc872c5 (diff) | |
| parent | c28bb0b8f9458404f0c6651ba41c8c28849efbdf (diff) | |
Move some java test setup later
am: c28bb0b8f9
Change-Id: Ib22830370d27e853151cc4419f6bbe791568a645
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/java/java_test.go b/java/java_test.go index 8d3efcb81..817955cad 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -24,6 +24,7 @@ import ( "android/soong/android" "android/soong/cc" + "android/soong/dexpreopt" "android/soong/genrule" ) @@ -101,8 +102,6 @@ func testContext(config android.Config, bp string, ctx.BottomUp("begin", cc.BeginMutator).Parallel() }) - ctx.Register() - bp += GatherRequiredDepsForTest() mockFS := map[string][]byte{ @@ -187,6 +186,11 @@ func testContext(config android.Config, bp string, func run(t *testing.T, ctx *android.TestContext, config android.Config) { t.Helper() + + pathCtx := android.PathContextForTesting(config, nil) + setDexpreoptTestGlobalConfig(config, dexpreopt.GlobalConfigForTests(pathCtx)) + + ctx.Register() _, errs := ctx.ParseFileList(".", []string{"Android.bp", "prebuilts/sdk/Android.bp"}) android.FailIfErrored(t, errs) _, errs = ctx.PrepareBuildActions(config) |