From 3047fa23da6d9f6e504c81e275ad7f6761fb7c7b Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 18 Apr 2019 10:56:44 -0700 Subject: 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 --- java/java_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'java/java_test.go') 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, -- cgit v1.2.3-59-g8ed1b