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
Merged-In: I126adf1d9e7b6acb528875ff62b974ba7ad9a337
(cherry picked from commit 3047fa23da6d9f6e504c81e275ad7f6761fb7c7b)
diff --git a/java/testing.go b/java/testing.go
index db06ae1..6b35bd0 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -37,7 +37,6 @@
extraModules := []string{
"core-lambda-stubs",
- "framework",
"ext",
"updatable_media_stubs",
"android_stubs_current",
@@ -62,6 +61,17 @@
}
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,