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 am: 379257c84b am: f8b4e59841 am: a494870a97 am: 28698644dd am: 25f45dbaf3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2779550

Change-Id: I897e6e114115559cb23c13c489620dfa7d9113be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Zi Wang
2023-10-10 21:17:47 +00:00
committed by Automerger Merge Worker
parent c645204efb 25f45dbaf3
commit f8a83c1913
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()
} }