summaryrefslogtreecommitdiff
path: root/apex/apex_test.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2021-05-14 18:53:43 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-05-14 18:53:43 +0000
commitfdd9743609e2b964db325bc06e96e906eeffa44b (patch)
tree040938d58b81f8559afb27445da096b8b7a78a49 /apex/apex_test.go
parentb7c78731d4cccf00645d8fb3d6ed9c692e4b83f7 (diff)
parentb6f53c064e66f1f7ded2121f9d592463d02e0bdd (diff)
Merge "Refactor special handling of hidden API encoding for master-art"
Diffstat (limited to 'apex/apex_test.go')
-rw-r--r--apex/apex_test.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go
index afc395d21..68182a712 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -4542,7 +4542,12 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) {
}
func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
- preparer := java.FixtureConfigureBootJars("myapex:libfoo", "myapex:libbar")
+ preparer := android.GroupFixturePreparers(
+ java.FixtureConfigureBootJars("myapex:libfoo", "myapex:libbar"),
+ // Make sure that the frameworks/base/Android.bp file exists as otherwise hidden API encoding
+ // is disabled.
+ android.FixtureAddTextFile("frameworks/base/Android.bp", ""),
+ )
checkBootDexJarPath := func(t *testing.T, ctx *android.TestContext, stem string, bootDexJarPath string) {
t.Helper()