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

Fix module-file name collisions

Browse Source 
Bazel doesn't allow a module and file with the same name.

Bug: 198619163
Test: Presubmits
Change-Id: Ie9731b627945d2ff221d3a5d08a32a5a172f9dcd
This commit is contained in:
Cole Faust
2022-09-01 15:20:00 -07:00
parent 6faa161557
commit bcc3d05aba
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/config/config.go
View File

@@ -148,7 +148,7 @@ func init() {
pctx.SourcePathVariable("JavaKytheExtractorJar", "prebuilts/build-tools/common/framework/javac_extractor.jar") pctx.SourcePathVariable("JavaKytheExtractorJar", "prebuilts/build-tools/common/framework/javac_extractor.jar")
pctx.SourcePathVariable("Ziptime", "prebuilts/build-tools/${hostPrebuiltTag}/bin/ziptime") pctx.SourcePathVariable("Ziptime", "prebuilts/build-tools/${hostPrebuiltTag}/bin/ziptime")
pctx.HostBinToolVariable("GenKotlinBuildFileCmd", "gen-kotlin-build-file.py") pctx.HostBinToolVariable("GenKotlinBuildFileCmd", "gen-kotlin-build-file")
pctx.SourcePathVariable("JarArgsCmd", "build/soong/scripts/jar-args.sh") pctx.SourcePathVariable("JarArgsCmd", "build/soong/scripts/jar-args.sh")
pctx.SourcePathVariable("PackageCheckCmd", "build/soong/scripts/package-check.sh") pctx.SourcePathVariable("PackageCheckCmd", "build/soong/scripts/package-check.sh")

2
scripts/Android.bp
View File

@@ -168,7 +168,7 @@ python_test_host {
} }
python_binary_host { python_binary_host {
name: "gen-kotlin-build-file.py", name: "gen-kotlin-build-file",
main: "gen-kotlin-build-file.py", main: "gen-kotlin-build-file.py",
srcs: [ srcs: [
"gen-kotlin-build-file.py", "gen-kotlin-build-file.py",