diff options
| author | Colin Cross <ccross@android.com> | 2019-04-18 10:56:44 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-04-22 10:08:35 -0700 |
| commit | 9bdfaf059105ab75bd4ca99629ce02659fe850fd (patch) | |
| tree | 22fbda0cf84fd9bf45260b612e8a3039022f0e0c /java/testing.go | |
| parent | 31174703be8d659cd5ab78fb465ac16b4e493713 (diff) | |
| download | android_build_soong-9bdfaf059105ab75bd4ca99629ce02659fe850fd.tar.gz android_build_soong-9bdfaf059105ab75bd4ca99629ce02659fe850fd.tar.bz2 android_build_soong-9bdfaf059105ab75bd4ca99629ce02659fe850fd.zip | |
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)
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 db06ae16..6b35bd04 100644 --- a/java/testing.go +++ b/java/testing.go @@ -37,7 +37,6 @@ func GatherRequiredDepsForTest() string { extraModules := []string{ "core-lambda-stubs", - "framework", "ext", "updatable_media_stubs", "android_stubs_current", @@ -62,6 +61,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, |