diff options
| author | 2019-04-18 10:56:44 -0700 | |
|---|---|---|
| committer | 2019-04-18 13:51:58 -0700 | |
| commit | 3047fa23da6d9f6e504c81e275ad7f6761fb7c7b (patch) | |
| tree | 04c66b654667b4f321746ab4f676adb465d404d8 /java/testing.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/testing.go')
| -rw-r--r-- | java/testing.go | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/java/testing.go b/java/testing.go index 7d23d8f7e..1be3768b5 100644 --- a/java/testing.go +++ b/java/testing.go @@ -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, |