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

Merge changes from topic "revert-1918946-revert-1899703-AMWIVCREEV-CCTEXIRRRV"

Browse Source 
* changes:
  Revert^2 "Add dependency license annotations"
  Revert^2 "Build license metadata files in Soong"
This commit is contained in:
Treehugger Robot
2021-12-11 03:32:18 +00:00
committed by Gerrit Code Review
parent 67938c2925 65cb314c92
commit f4c2bf6559
11 changed files with 333 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/sdk_library.go
View File

@@ -1222,11 +1222,16 @@ func (module *SdkLibrary) DepsMutator(ctx android.BottomUpMutatorContext) {
func (module *SdkLibrary) OutputFiles(tag string) (android.Paths, error) {
paths, err := module.commonOutputFiles(tag)
if paths == nil && err == nil {
return module.Library.OutputFiles(tag)
} else {
if paths != nil || err != nil {
return paths, err
}
if module.requiresRuntimeImplementationLibrary() {
return module.Library.OutputFiles(tag)
}
if tag == "" {
return nil, nil
}
return nil, fmt.Errorf("unsupported module reference tag %q", tag)
}
func (module *SdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {