summaryrefslogtreecommitdiff
path: root/apex/apex_test.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2021-03-24 10:40:38 +0000
committer Paul Duffin <paulduffin@google.com> 2021-03-30 19:35:35 +0100
commite8366da1f61cbff804cefe3b69f6293b4bad0c98 (patch)
tree34b781c8f22d8f72d2592147037baf7309c9cfad /apex/apex_test.go
parentb2786a3fdc36cb87c5ef5a9b4940cacffc0a90f2 (diff)
Automatically call TestingBuildParams.RelativeToTop()
Fixes the few tests that break due to this and which cannot easily be separated into their own changes. Bug: 183650682 Test: m nothing Change-Id: Ia2f31213a1f114a78e66a81d89279ecde9f4c465
Diffstat (limited to 'apex/apex_test.go')
-rw-r--r--apex/apex_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 5476fe845..11b23c6bf 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -5066,7 +5066,7 @@ func TestApexWithApps(t *testing.T) {
}
// JNI libraries including transitive deps are
for _, jni := range []string{"libjni", "libfoo"} {
- jniOutput := ctx.ModuleForTests(jni, "android_arm64_armv8-a_sdk_shared_apex10000").Module().(*cc.Module).OutputFile()
+ jniOutput := ctx.ModuleForTests(jni, "android_arm64_armv8-a_sdk_shared_apex10000").Module().(*cc.Module).OutputFile().RelativeToPath()
// ... embedded inside APK (jnilibs.zip)
ensureListContains(t, appZipRule.Implicits.Strings(), jniOutput.String())
// ... and not directly inside the APEX