Merge "Remove unused symlink code" into main am: 7a07b85fb5 am: c2bcfdb2ba am: ffd4c59db4

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

Change-Id: I4bab93cf43b27387cf3ed2038f57d8364caf2c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kousik Kumar
2023-09-15 20:05:45 +00:00
committed by Automerger Merge Worker

View File

@@ -289,31 +289,12 @@ func logAndSymlinkSetup(buildCtx build.Context, config build.Config) {
}
}
// Fix up the source tree due to a repo bug where it doesn't remove
// linkfiles that have been removed
fixBadDanglingLink(buildCtx, "hardware/qcom/sdm710/Android.bp")
fixBadDanglingLink(buildCtx, "hardware/qcom/sdm710/Android.mk")
// Create a source finder.
f := build.NewSourceFinder(buildCtx, config)
defer f.Shutdown()
build.FindSources(buildCtx, config, f)
}
func fixBadDanglingLink(ctx build.Context, name string) {
_, err := os.Lstat(name)
if err != nil {
return
}
_, err = os.Stat(name)
if os.IsNotExist(err) {
err = os.Remove(name)
if err != nil {
ctx.Fatalf("Failed to remove dangling link %q: %v", name, err)
}
}
}
func dumpVar(ctx build.Context, config build.Config, args []string) {
logAndSymlinkSetup(ctx, config)
flags := flag.NewFlagSet("dumpvar", flag.ExitOnError)