diff options
| author | Colin Cross <ccross@android.com> | 2019-03-04 19:40:03 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-04 19:40:03 -0800 |
| commit | 33db6a29cce03315fba7ea66d486875af7456462 (patch) | |
| tree | a63ec1eda26583b4757334cdb46f8ad63aa6878d /java/java_test.go | |
| parent | 84e8518011192ad6d95ed227795e7283c6c52bf1 (diff) | |
| parent | 7cb6f9e6016e84193f74f1454e7b7cb0ca346ea1 (diff) | |
| download | build_soong-33db6a29cce03315fba7ea66d486875af7456462.tar.gz build_soong-33db6a29cce03315fba7ea66d486875af7456462.tar.bz2 build_soong-33db6a29cce03315fba7ea66d486875af7456462.zip | |
Move some java test setup later am: c28bb0b8f9 am: 7e2b9c48ca
am: 7cb6f9e601
Change-Id: Ib0924d35bc9cd844a071e5f8729f5e2f7b8b6745
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 9202cdcb..fe4e24d8 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) |