changed newLocation option to be new-location in bpmodify am: ab1bac0e12 am: d121a7b5d4 am: 8399b71de0 am: b954d4502a

Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2175958

Change-Id: I009d4ed38e1aaf1f5411401af2aaca3471bc1a6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alix 2022-08-05 23:34:52 +00:00 committed by Automerger Merge Worker
commit daedd01a62

View file

@ -32,7 +32,7 @@ var (
addIdents = new(identSet)
removeIdents = new(identSet)
removeProperty = flag.Bool("remove-property", false, "remove the property")
moveProperty = flag.Bool("move-property", false, "moves contents of property into newLocation")
moveProperty = flag.Bool("move-property", false, "moves contents of property into new-location")
newLocation string
setString *string
addLiteral *string
@ -42,7 +42,7 @@ func init() {
flag.Var(targetedModules, "m", "comma or whitespace separated list of modules on which to operate")
flag.Var(targetedProperty, "parameter", "alias to -property=`name`")
flag.Var(targetedProperty, "property", "fully qualified `name` of property to modify (default \"deps\")")
flag.StringVar(&newLocation, "newLocation", "", " use with moveProperty to move contents of -property into a property with name newLocation ")
flag.StringVar(&newLocation, "new-location", "", " use with moveProperty to move contents of -property into a property with name -new-location ")
flag.Var(addIdents, "a", "comma or whitespace separated list of identifiers to add")
flag.Var(stringPtrFlag{&addLiteral}, "add-literal", "a literal to add")
flag.Var(removeIdents, "r", "comma or whitespace separated list of identifiers to remove")
@ -375,7 +375,7 @@ func main() {
}
if *moveProperty && newLocation == "" {
report(fmt.Errorf("-move-property must specify newLocation"))
report(fmt.Errorf("-move-property must specify -new-location"))
return
}