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/gen.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/gen.go')
| -rw-r--r-- | java/gen.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/gen.go b/java/gen.go index 500d887e..09776283 100644 --- a/java/gen.go +++ b/java/gen.go @@ -59,7 +59,7 @@ var ( }) ) -func genAidl(ctx android.ModuleContext, aidlFile android.Path, aidlFlags string) android.Path { +func genAidl(ctx android.ModuleContext, aidlFile android.Path, aidlFlags string, deps android.Paths) android.Path { javaFile := android.GenPathWithExt(ctx, "aidl", aidlFile, "java") depFile := javaFile.String() + ".d" @@ -68,6 +68,7 @@ func genAidl(ctx android.ModuleContext, aidlFile android.Path, aidlFlags string) Description: "aidl " + aidlFile.Rel(), Output: javaFile, Input: aidlFile, + Implicits: deps, Args: map[string]string{ "depFile": depFile, "aidlFlags": aidlFlags, @@ -111,7 +112,7 @@ func (j *Module) genSources(ctx android.ModuleContext, srcFiles android.Paths, for _, srcFile := range srcFiles { switch srcFile.Ext() { case ".aidl": - javaFile := genAidl(ctx, srcFile, flags.aidlFlags) + javaFile := genAidl(ctx, srcFile, flags.aidlFlags, flags.aidlDeps) outSrcFiles = append(outSrcFiles, javaFile) case ".logtags": j.logtagsSrcs = append(j.logtagsSrcs, srcFile) |