Merge "Add android.test.base to class loader context for API version < 30." am: ad02d401ab am: 6200c519e2

Change-Id: I998889df1bd34e7bb15df3cd5791cb5f70d7d0ae
2020-06-01 15:29:22 +00:00
parent 1b54c4f596 6200c519e2
commit a5b0450554
3 changed files with 37 additions and 0 deletions
--- a/java/app.go
+++ b/java/app.go
@@ -1880,6 +1880,7 @@ func (u *usesLibrary) deps(ctx android.BottomUpMutatorContext, hasFrameworkLibs
 				"org.apache.http.legacy",
 				"android.hidl.base-V1.0-java",
 				"android.hidl.manager-V1.0-java")
+			ctx.AddVariationDependencies(nil, usesLibTag, optionalUsesLibs...)
 		}
 	}
 }