Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32eccae1 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Rename OptionalPath.RelativeToPath -> RelativeToTop"

parents ae424648 afdd4061

android/paths.go

+3 −3
Original line number Diff line number Diff line
@@ -286,9 +286,9 @@ func (p OptionalPath) Path() Path { 
	return p.path

}



// RelativeToPath returns an OptionalPath with the path that was embedded having been replaced by

// the result of calling Path.RelativeToPath on it.

func (p OptionalPath) RelativeToPath() OptionalPath {

// RelativeToTop returns an OptionalPath with the path that was embedded having been replaced by the

// result of calling Path.RelativeToTop on it.

func (p OptionalPath) RelativeToTop() OptionalPath {

	if !p.valid {

		return p

	}

apex/apex_test.go

+1 −1
Original line number Diff line number Diff line
@@ -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().RelativeToPath()

		jniOutput := ctx.ModuleForTests(jni, "android_arm64_armv8-a_sdk_shared_apex10000").Module().(*cc.Module).OutputFile().RelativeToTop()

		// ... embedded inside APK (jnilibs.zip)

		ensureListContains(t, appZipRule.Implicits.Strings(), jniOutput.String())

		// ... and not directly inside the APEX

cc/proto_test.go

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ func TestProto(t *testing.T) { 
			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) {

			t.Errorf("expected %q in %q", w, cmd)