From 77cdcfdeafd383ef1f1214226c47eb20c902a28f Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 12 Mar 2021 11:28:25 -0800
Subject: Move android package on top of remotexec

Remove the references to the android package in remotexec so that
the android package can reference the remoteexec package.  This
will allow RuleBuilder to integrate directly with remoteexec.

Bug: 182612695
Test: m checkbuild
Change-Id: I15be5ef126d8aacbd605518638f341daf6f31bb3
---
 java/app_builder.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/app_builder.go')

diff --git a/java/app_builder.go b/java/app_builder.go
index b53c15ab4..4a18dcada 100644
--- a/java/app_builder.go
+++ b/java/app_builder.go
@@ -30,7 +30,7 @@ import (
 )
 
 var (
-	Signapk, SignapkRE = remoteexec.StaticRules(pctx, "signapk",
+	Signapk, SignapkRE = pctx.RemoteStaticRules("signapk",
 		blueprint.RuleParams{
 			Command: `rm -f $out && $reTemplate${config.JavaCmd} ${config.JavaVmFlags} -Djava.library.path=$$(dirname ${config.SignapkJniLibrary}) ` +
 				`-jar ${config.SignapkCmd} $flags $certificates $in $out`,
-- 
cgit v1.2.3-59-g8ed1b