StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename OptionalPath.RelativeToPath -> RelativeToTop" am: 32eccae1ac

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658072

Change-Id: I6b9fd21978838a5bae4926e51ef94ca4d81e1560
This commit is contained in:
Paul Duffin
2021-03-31 09:24:51 +00:00
committed by Automerger Merge Worker
parent 1a454d987c 32eccae1ac
commit 4ac8cd6582
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/paths.go
View File

@@ -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
} }

2
apex/apex_test.go
View File

@@ -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

2
cc/proto_test.go
View File

@@ -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)