Annotate paths and deprecate ExtractSource(s)Deps
Add `android:"path"` to all properties that take paths to source
files, and remove the calls to ExtractSource(s)Deps, the
pathsDepsMutator will add the necessary SourceDepTag dependency.
Test: All soong tests
Change-Id: I488ba1a5d680aaa50b04fc38acf693e23c6d4d6d
diff --git a/cc/linker.go b/cc/linker.go
index 9d4a0e8..fd958ba 100644
--- a/cc/linker.go
+++ b/cc/linker.go
@@ -149,7 +149,7 @@
Pack_relocations *bool `android:"arch_variant"`
// local file name to pass to the linker as --version_script
- Version_script *string `android:"arch_variant"`
+ Version_script *string `android:"path,arch_variant"`
// Local file name to pass to the linker as --symbol-ordering-file
Symbol_ordering_file *string `android:"arch_variant"`
@@ -281,16 +281,6 @@
deps.LateStaticLibs = append(deps.LateStaticLibs, "libwinpthread")
}
- // Version_script is not needed when linking stubs lib where the version
- // script is created from the symbol map file.
- if !linker.dynamicProperties.BuildStubs {
- android.ExtractSourceDeps(ctx, linker.Properties.Version_script)
- android.ExtractSourceDeps(ctx,
- linker.Properties.Target.Vendor.Version_script)
- }
-
- android.ExtractSourceDeps(ctx, linker.Properties.Symbol_ordering_file)
-
return deps
}