diff options
| author | 2019-04-22 23:26:55 +0000 | |
|---|---|---|
| committer | 2019-04-22 23:26:55 +0000 | |
| commit | efcdd3b4bd676dcdffa3f926c8434c213726b749 (patch) | |
| tree | 6212cf0bf848702a8a39e425e6c0736a7b377250 /java/java_test.go | |
| parent | a3f279bd1bb062755cdc6406fd43d7fd781ddb91 (diff) | |
| parent | 5c87791a78fc31620b165300c7976d8cf5674f9c (diff) | |
Merge changes from topic "framework.aidl" into qt-dev
* changes:
Allow codename.fingerprint format for targetSdkVersion
Build framework.aidl in Soong
Get default sdk_test.go values from config
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 415862177..c14880758 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -97,7 +97,7 @@ func testContext(config android.Config, bp string, ctx.TopDown("java_sdk_library", SdkLibraryMutator).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, |