From 79fac05b45468678fb39446a680dfc18a0b824db Mon Sep 17 00:00:00 2001
From: Artur Satayev <satayev@google.com>
Date: Mon, 20 Jan 2020 19:11:33 +0000
Subject: [PATCH] Use flag names with merge_csv.py.

Bug: 145132366
Test: diff -w out/soong/hiddenapi/hiddenapi-greylist.csv
Change-Id: If63c8ae5eda48e49bf58a338bf08f0f2d4fea3cf
---
 java/hiddenapi_singleton.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go
index 3243e43fa..785019324 100644
--- a/java/hiddenapi_singleton.go
+++ b/java/hiddenapi_singleton.go
@@ -294,9 +294,8 @@ func metadataRule(ctx android.SingletonContext) android.Path {
 
 	rule.Command().
 		BuiltTool(ctx, "merge_csv").
-		Inputs(metadataCSV).
-		Text(">").
-		Output(outputPath)
+		FlagWithOutput("--output=", outputPath).
+		Inputs(metadataCSV)
 
 	rule.Build(pctx, ctx, "hiddenAPIGreylistMetadataFile", "hiddenapi greylist metadata")