StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "aconfig_framework_circle" into main

Browse Source 
* changes:
  Allow generated java libs to specify libraries.
  Allow access to the generated srcjars for GeneratedJavaLibrary
This commit is contained in:
Treehugger Robot
2023-08-21 16:30:52 +00:00
committed by Gerrit Code Review
parent 497a6df359 9e3716caea
commit a9dbd27afa
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/base.go
View File

@@ -622,6 +622,8 @@ func (j *Module) OutputFiles(tag string) (android.Paths, error) {
return android.Paths{j.dexer.proguardDictionary.Path()}, nil return android.Paths{j.dexer.proguardDictionary.Path()}, nil
} }
return nil, fmt.Errorf("%q was requested, but no output file was found.", tag) return nil, fmt.Errorf("%q was requested, but no output file was found.", tag)
case ".generated_srcjars":
return j.properties.Generated_srcjars, nil
default: default:
return nil, fmt.Errorf("unsupported module reference tag %q", tag) return nil, fmt.Errorf("unsupported module reference tag %q", tag)
} }

5
java/generated_java_library.go
View File

@@ -78,11 +78,6 @@ func (module *GeneratedJavaLibraryModule) GenerateAndroidBuildActions(ctx androi
checkPropertyEmpty(ctx, module, "exclude_srcs", module.Library.properties.Exclude_srcs) checkPropertyEmpty(ctx, module, "exclude_srcs", module.Library.properties.Exclude_srcs)
checkPropertyEmpty(ctx, module, "java_resource_dirs", module.Library.properties.Java_resource_dirs) checkPropertyEmpty(ctx, module, "java_resource_dirs", module.Library.properties.Java_resource_dirs)
checkPropertyEmpty(ctx, module, "exclude_java_resource_dirs", module.Library.properties.Exclude_java_resource_dirs) checkPropertyEmpty(ctx, module, "exclude_java_resource_dirs", module.Library.properties.Exclude_java_resource_dirs)
// No additional libraries. The generator should add anything necessary automatically
// by returning something from ____ (TODO: Additional libraries aren't needed now, so
// these are just blocked).
checkPropertyEmpty(ctx, module, "libs", module.Library.properties.Libs)
checkPropertyEmpty(ctx, module, "static_libs", module.Library.properties.Static_libs)
// Restrict these for no good reason other than to limit the surface area. If there's a // Restrict these for no good reason other than to limit the surface area. If there's a
// good use case put them back. // good use case put them back.
checkPropertyEmpty(ctx, module, "plugins", module.Library.properties.Plugins) checkPropertyEmpty(ctx, module, "plugins", module.Library.properties.Plugins)