Merge "Rename OptionalPath.RelativeToPath -> RelativeToTop"
This commit is contained in:
commit
32eccae1ac
|
@ -286,9 +286,9 @@ func (p OptionalPath) Path() Path {
|
||||||
return p.path
|
return p.path
|
||||||
}
|
}
|
||||||
|
|
||||||
// RelativeToPath returns an OptionalPath with the path that was embedded having been replaced by
|
// RelativeToTop returns an OptionalPath with the path that was embedded having been replaced by the
|
||||||
// the result of calling Path.RelativeToPath on it.
|
// result of calling Path.RelativeToTop on it.
|
||||||
func (p OptionalPath) RelativeToPath() OptionalPath {
|
func (p OptionalPath) RelativeToTop() OptionalPath {
|
||||||
if !p.valid {
|
if !p.valid {
|
||||||
return p
|
return p
|
||||||
}
|
}
|
||||||
|
|
|
@ -5066,7 +5066,7 @@ func TestApexWithApps(t *testing.T) {
|
||||||
}
|
}
|
||||||
// JNI libraries including transitive deps are
|
// JNI libraries including transitive deps are
|
||||||
for _, jni := range []string{"libjni", "libfoo"} {
|
for _, jni := range []string{"libjni", "libfoo"} {
|
||||||
jniOutput := ctx.ModuleForTests(jni, "android_arm64_armv8-a_sdk_shared_apex10000").Module().(*cc.Module).OutputFile().RelativeToPath()
|
jniOutput := ctx.ModuleForTests(jni, "android_arm64_armv8-a_sdk_shared_apex10000").Module().(*cc.Module).OutputFile().RelativeToTop()
|
||||||
// ... embedded inside APK (jnilibs.zip)
|
// ... embedded inside APK (jnilibs.zip)
|
||||||
ensureListContains(t, appZipRule.Implicits.Strings(), jniOutput.String())
|
ensureListContains(t, appZipRule.Implicits.Strings(), jniOutput.String())
|
||||||
// ... and not directly inside the APEX
|
// ... and not directly inside the APEX
|
||||||
|
|
|
@ -61,7 +61,7 @@ func TestProto(t *testing.T) {
|
||||||
t.Errorf("expected %q in %q", w, cmd)
|
t.Errorf("expected %q in %q", w, cmd)
|
||||||
}
|
}
|
||||||
|
|
||||||
foobarPath := foobar.Module().(android.HostToolProvider).HostToolPath().RelativeToPath().String()
|
foobarPath := foobar.Module().(android.HostToolProvider).HostToolPath().RelativeToTop().String()
|
||||||
|
|
||||||
if w := "--plugin=protoc-gen-foobar=" + foobarPath; !strings.Contains(cmd, w) {
|
if w := "--plugin=protoc-gen-foobar=" + foobarPath; !strings.Contains(cmd, w) {
|
||||||
t.Errorf("expected %q in %q", w, cmd)
|
t.Errorf("expected %q in %q", w, cmd)
|
||||||
|
|
Loading…
Reference in New Issue