commit 29fd971526d8ea8a2d76459d4d40be9ffc5fefaa
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 30 23:12:39 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 30 23:12:39 2020 +0000
tree 5344b13834f75454cf6ae041de037f59440d4599
parent 44fc5d201fc2dd2267b80db0076430beda2da037
parent 5b511a200ef62e9078aee856b5f9c14a6e26e3b7

Merge changes I99cdff4b,Ia6b5cff8,I0f438509

* changes:
  Allow an arbitrary tag to be associated with a bp property
  Rewrite code for creating versioned modules as a transformation
  Add support for transforming a module

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)