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

Merge "Address comments from aosp/2777928" into main

Browse Source
This commit is contained in:
Zi Wang
2023-10-10 16:46:13 +00:00
committed by Gerrit Code Review
parent e94f26e2e8 74c9a7758b
commit 379257c84b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/bazel.go
View File

@@ -549,7 +549,8 @@ func (b *BazelModuleBase) shouldConvertWithBp2build(ctx shouldConvertModuleConte
// the same name are both allowlisted. This cannot be applied to all the *_import // the same name are both allowlisted. This cannot be applied to all the *_import
// module types. For example, android_library_import has to use original module // module types. For example, android_library_import has to use original module
// name here otherwise the *-nodeps targets cannot be handled correctly. // name here otherwise the *-nodeps targets cannot be handled correctly.
if strings.HasPrefix(p.moduleType, "java_import") { // TODO(b/304385140): remove this special casing
if p.moduleType == "java_import" || p.moduleType == "java_import_host" {
moduleName = module.Name() moduleName = module.Name()
} }