diff options
| author | Colin Cross <ccross@android.com> | 2019-04-21 17:20:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-21 17:20:16 +0000 |
| commit | 8bf9bd9f913055784418e5fb7eace21942cae422 (patch) | |
| tree | 2de19c60e0316e9fb56064f8a524c0761508bd15 /java/java_test.go | |
| parent | 7fdab6eeecb9dacdb4a4a7c7ce60b583657fdba7 (diff) | |
| parent | 3047fa23da6d9f6e504c81e275ad7f6761fb7c7b (diff) | |
Merge "Build framework.aidl in Soong"
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/java_test.go b/java/java_test.go index 9438ce297..3fab43d6d 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -97,7 +97,7 @@ func testContext(config android.Config, bp string, ctx.TopDown("prebuilt_apis", PrebuiltApisMutator).Parallel() }) ctx.RegisterPreSingletonType("overlay", android.SingletonFactoryAdaptor(OverlaySingletonFactory)) - ctx.RegisterPreSingletonType("sdk", android.SingletonFactoryAdaptor(sdkSingletonFactory)) + ctx.RegisterPreSingletonType("sdk_versions", android.SingletonFactoryAdaptor(sdkPreSingletonFactory)) // Register module types and mutators from cc needed for JNI testing ctx.RegisterModuleType("cc_library", android.ModuleFactoryAdaptor(cc.LibraryFactory)) @@ -131,6 +131,7 @@ func testContext(config android.Config, bp string, "api/system-removed.txt": nil, "api/test-current.txt": nil, "api/test-removed.txt": nil, + "framework/aidl/a.aidl": nil, "prebuilts/sdk/14/public/android.jar": nil, "prebuilts/sdk/14/public/framework.aidl": nil, |