diff options
| author | 2019-04-21 10:29:42 -0700 | |
|---|---|---|
| committer | 2019-04-21 10:29:42 -0700 | |
| commit | 2e2967423a59de347065b41c66525756041de2be (patch) | |
| tree | 5658caf6270ad50cab07719abab18f5edd1061a7 /java/java_test.go | |
| parent | fd9fa1a56ebec607aa5f375d8118b8801b814cbe (diff) | |
| parent | 8bf9bd9f913055784418e5fb7eace21942cae422 (diff) | |
Merge "Build framework.aidl in Soong"
am: 8bf9bd9f91
Change-Id: Iffe8b5a7b2d6ce06cb369e064374cc009eea1cc1
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, |