add aidl.export_include_dirs to java_import module type
This allows a java prebuilt to export AIDL files to its clients. Bug: 151933053 Test: m Change-Id: I21b5d5ce647141a7c76f62490adbccb858b10323
This commit is contained in:
11
java/java.go
11
java/java.go
@@ -2338,6 +2338,12 @@ type ImportProperties struct {
|
||||
|
||||
// set the name of the output
|
||||
Stem *string
|
||||
|
||||
Aidl struct {
|
||||
// directories that should be added as include directories for any aidl sources of modules
|
||||
// that depend on this module, as well as to aidl for this module.
|
||||
Export_include_dirs []string
|
||||
}
|
||||
}
|
||||
|
||||
type Import struct {
|
||||
@@ -2351,6 +2357,7 @@ type Import struct {
|
||||
|
||||
combinedClasspathFile android.Path
|
||||
exportedSdkLibs []string
|
||||
exportAidlIncludeDirs android.Paths
|
||||
}
|
||||
|
||||
func (j *Import) sdkVersion() sdkSpec {
|
||||
@@ -2424,6 +2431,8 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"),
|
||||
jarName, outputFile)
|
||||
}
|
||||
|
||||
j.exportAidlIncludeDirs = android.PathsForModuleSrc(ctx, j.properties.Aidl.Export_include_dirs)
|
||||
}
|
||||
|
||||
var _ Dependency = (*Import)(nil)
|
||||
@@ -2458,7 +2467,7 @@ func (j *Import) DexJar() android.Path {
|
||||
}
|
||||
|
||||
func (j *Import) AidlIncludeDirs() android.Paths {
|
||||
return nil
|
||||
return j.exportAidlIncludeDirs
|
||||
}
|
||||
|
||||
func (j *Import) ExportedSdkLibs() []string {
|
||||
|
Reference in New Issue
Block a user