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

Merge "Return the header jar of the implementation library in SdkHeaderJars()" into main am: 133a6d9e6f am: f68bf7d95b

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

Change-Id: I9943c80d7c530fa86ab8d2e81dfd64cb7ce5fdfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-04-05 04:13:51 +00:00
committed by Automerger Merge Worker
parent ac6597d589 f68bf7d95b
commit 926580047b
2 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex_test.go
View File

@@ -7334,7 +7334,7 @@ func TestJavaSDKLibrary_WithinApex(t *testing.T) {
// The bar library should depend on the implementation jar.
barLibrary := ctx.ModuleForTests("bar", "android_common_myapex").Rule("javac")
if expected, actual := `^-classpath [^:]*/turbine-combined/foo\.jar$`, barLibrary.Args["classpath"]; !regexp.MustCompile(expected).MatchString(actual) {
if expected, actual := `^-classpath [^:]*/turbine-combined/foo\.impl\.jar$`, barLibrary.Args["classpath"]; !regexp.MustCompile(expected).MatchString(actual) {
t.Errorf("expected %q, found %#q", expected, actual)
}
}