diff options
| author | Colin Cross <ccross@android.com> | 2019-04-18 10:56:44 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-04-18 13:51:58 -0700 |
| commit | 3047fa23da6d9f6e504c81e275ad7f6761fb7c7b (patch) | |
| tree | 04c66b654667b4f321746ab4f676adb465d404d8 /java/java_test.go | |
| parent | 60405e50f8bac88f483d78b07a0fa2311ee08b9f (diff) | |
Build framework.aidl in Soong
Move the rules to build framework.aidl into Soong, and use it
when compiling aidl files with sdk_version: "current".
Also fixes incorrectly using the aidl includes exported by the
"framework" module when the proguardRaiseDep dependency was
added.
Bug: 130798034
Test: sdk_test.go
Change-Id: I126adf1d9e7b6acb528875ff62b974ba7ad9a337
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 0a1c17c1c..1a4db21c8 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, |