summaryrefslogtreecommitdiff
path: root/java/builder.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-04-18 10:56:44 -0700
committer Colin Cross <ccross@android.com> 2019-04-18 13:51:58 -0700
commit3047fa23da6d9f6e504c81e275ad7f6761fb7c7b (patch)
tree04c66b654667b4f321746ab4f676adb465d404d8 /java/builder.go
parent60405e50f8bac88f483d78b07a0fa2311ee08b9f (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/builder.go')
-rw-r--r--java/builder.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/java/builder.go b/java/builder.go
index 338cd52ed..d257d1da1 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -154,6 +154,7 @@ type javaBuilderFlags struct {
processor string
systemModules classpath
aidlFlags string
+ aidlDeps android.Paths
javaVersion string
errorProneExtraJavacFlags string