diff options
| author | 2019-05-10 15:16:29 -0700 | |
|---|---|---|
| committer | 2019-05-15 12:11:18 -0700 | |
| commit | b639a6adb284ad8c9d320127fd205b77990ef146 (patch) | |
| tree | 6f792947a505e62ae18c5023c6926ba5d1d27788 /java/java_test.go | |
| parent | bc975e8b897eaff7e5729fc362c31d35e838526a (diff) | |
Fix override_android_app dependency issues.
This change fixes an issue where an android_test could not depened on an
override_android_app or an android_app overridden by one by moving all
override processing to post-deps and forwarding incoming dependencies on
override_android_apps to base android_app modules
Fixes: 132447700
Test: app_test.go
Change-Id: I4ac593be661f541f5ea9823ef97373bee4b186f9
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java_test.go b/java/java_test.go index 370e79645..50b1c34ce 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -93,10 +93,10 @@ func testContext(config android.Config, bp string, ctx.PreArchMutators(android.RegisterPrebuiltsPreArchMutators) ctx.PreArchMutators(android.RegisterPrebuiltsPostDepsMutators) ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) - ctx.PreArchMutators(android.RegisterOverridePreArchMutators) ctx.PreArchMutators(func(ctx android.RegisterMutatorsContext) { ctx.TopDown("prebuilt_apis", PrebuiltApisMutator).Parallel() }) + ctx.PostDepsMutators(android.RegisterOverridePostDepsMutators) ctx.RegisterPreSingletonType("overlay", android.SingletonFactoryAdaptor(OverlaySingletonFactory)) ctx.RegisterPreSingletonType("sdk_versions", android.SingletonFactoryAdaptor(sdkPreSingletonFactory)) |