commit b01dd442661575e88bf9d8ecc88b7b063794f29c
author Artur Satayev <satayev@google.com> Mon Jan 20 17:53:31 2020 +0000
committer Artur Satayev <satayev@google.com> Mon Jan 20 17:59:02 2020 +0000
tree 6bd0ba49f13bbb426ecc19dca611749f19285f0d
parent 814bebb8ea2f39a54d872a71c2a8d1d7f7d9903e

Use merge_csv python_binary.

Instead of using .py file directly.

Bug: 145132366
Test: diff -w out/soong/hiddenapi/hiddenapi-greylist.csv
Change-Id: Ib79019234b4ae05486e831b30d27bd1be3bbba67

java/hiddenapi_singleton.go

diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go
index ad84cde..3243e43 100644
--- a/java/hiddenapi_singleton.go
+++ b/java/hiddenapi_singleton.go
@@ -293,7 +293,7 @@
 	outputPath := hiddenAPISingletonPaths(ctx).metadata
 
 	rule.Command().
-		Tool(android.PathForSource(ctx, "frameworks/base/tools/hiddenapi/merge_csv.py")).
+		BuiltTool(ctx, "merge_csv").
 		Inputs(metadataCSV).
 		Text(">").
 		Output(outputPath)