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
This commit is contained in:
Colin Cross
2019-04-18 10:56:44 -07:00
parent 60405e50f8
commit 3047fa23da
9 changed files with 367 additions and 235 deletions

View File

@@ -37,7 +37,6 @@ func GatherRequiredDepsForTest() string {
extraModules := []string{
"core-lambda-stubs",
"framework",
"ext",
"android_stubs_current",
"android_system_stubs_current",
@@ -61,6 +60,17 @@ func GatherRequiredDepsForTest() string {
}
bp += `
java_library {
name: "framework",
srcs: ["a.java"],
no_standard_libs: true,
sdk_version: "core_current",
system_modules: "core-platform-api-stubs-system-modules",
aidl: {
export_include_dirs: ["framework/aidl"],
},
}
android_app {
name: "framework-res",
no_framework_libs: true,