commit c4efd9cb55239a9cb71286781ef47371d4f391a9
author Steven Moreland <smoreland@google.com> Fri Jan 18 11:51:25 2019 -0800
committer Steven Moreland <smoreland@google.com> Wed Jan 23 18:05:18 2019 +0000
tree 5fbf376c6f2c7b150ffc75b8f5f7913e5a60ce24
parent c7f797ea545d0c1c079b88743a4a8107a6195611

jarjar_rules: accept file-group

This allows a jarjar rule to be shared among multiple targets in
different directories.

Bug: 86259915
Test: use filegroup jarjar_rules
Change-Id: I3fa476c4e87e2460ab9fabfb34229f471c80e6b0

java/jdeps_test.go

diff --git a/java/jdeps_test.go b/java/jdeps_test.go
index ca8a3cd..874d1d7 100644
--- a/java/jdeps_test.go
+++ b/java/jdeps_test.go
@@ -76,7 +76,7 @@
 func TestCollectJavaLibraryPropertiesAddJarjarRules(t *testing.T) {
 	expected := "Jarjar_rules.txt"
 	module := LibraryFactory().(*Library)
-	module.properties.Jarjar_rules = &expected
+	module.expandJarjarRules = android.PathForTesting(expected)
 	dpInfo := &android.IdeInfo{}
 
 	module.IDEInfo(dpInfo)