Merge changes Ica0cb5a5,If432cdc6,Idb4b0b0a into main am: 1a7d900c78 am: a7906c717c

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

Change-Id: I3893d25882248f645c37718793907b7a1a64f0f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jihoon Kang
2024-09-23 18:21:01 +00:00
committed by Automerger Merge Worker
9 changed files with 205 additions and 388 deletions

View File

@@ -7100,7 +7100,7 @@ func TestJavaSDKLibrary_WithinApex(t *testing.T) {
java_library {
name: "bar",
srcs: ["a.java"],
libs: ["foo"],
libs: ["foo.impl"],
apex_available: ["myapex"],
sdk_version: "none",
system_modules: "none",
@@ -7153,7 +7153,7 @@ func TestJavaSDKLibrary_CrossBoundary(t *testing.T) {
java_library {
name: "bar",
srcs: ["a.java"],
libs: ["foo"],
libs: ["foo.stubs"],
sdk_version: "none",
system_modules: "none",
}
@@ -7207,7 +7207,7 @@ func TestJavaSDKLibrary_ImportPreferred(t *testing.T) {
java_library {
name: "bar",
srcs: ["a.java"],
libs: ["foo"],
libs: ["foo.impl"],
apex_available: ["myapex"],
sdk_version: "none",
system_modules: "none",