commit 9bdfaf059105ab75bd4ca99629ce02659fe850fd
author Colin Cross <ccross@android.com> Thu Apr 18 10:56:44 2019 -0700
committer Colin Cross <ccross@android.com> Mon Apr 22 10:08:35 2019 -0700
tree 22fbda0cf84fd9bf45260b612e8a3039022f0e0c
parent 31174703be8d659cd5ab78fb465ac16b4e493713

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)

java/builder.go

diff --git a/java/builder.go b/java/builder.go
index 338cd52..d257d1d 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -154,6 +154,7 @@
 	processor     string
 	systemModules classpath
 	aidlFlags     string
+	aidlDeps      android.Paths
 	javaVersion   string
 
 	errorProneExtraJavacFlags string