StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Build framework.aidl in Soong" am: 8bf9bd9f91

Browse Source 
am: 2e2967423a

Change-Id: I177c278e520177929aeb76fc1ce6f05ebc576a20
This commit is contained in:
Colin Cross
2019-04-21 10:38:53 -07:00
committed by android-build-merger
parent 8a4c0da74d 2e2967423a
commit 19b9e855c9
9 changed files with 367 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/java_test.go
View File

@@ -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,