From b01dd442661575e88bf9d8ecc88b7b063794f29c Mon Sep 17 00:00:00 2001 From: Artur Satayev Date: Mon, 20 Jan 2020 17:53:31 +0000 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index ad84cdea2..3243e43fa 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -293,7 +293,7 @@ func metadataRule(ctx android.SingletonContext) android.Path { 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)