Merge "Differentiate between exported and internal sdk members"

1 files changed, 41 insertions, 7 deletions

diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go
index 79d3c26e3..0737e5e2f 100644
--- a/sdk/java_sdk_test.go
+++ b/sdk/java_sdk_test.go
@@ -588,12 +588,13 @@ func TestSnapshotWithJavaSystemModules(t *testing.T) {
 	result := testSdkWithJava(t, `
 		sdk {
 			name: "mysdk",
+			java_header_libs: ["exported-system-module"],
 			java_system_modules: ["my-system-modules"],
 		}
 
 		java_system_modules {
 			name: "my-system-modules",
-			libs: ["system-module"],
+			libs: ["system-module", "exported-system-module"],
 		}
 
 		java_library {
@@ -602,6 +603,13 @@ func TestSnapshotWithJavaSystemModules(t *testing.T) {
 			sdk_version: "none",
 			system_modules: "none",
 		}
+
+		java_library {
+			name: "exported-system-module",
+			srcs: ["Test.java"],
+			sdk_version: "none",
+			system_modules: "none",
+		}
 	`)
 
 	result.CheckSnapshot("mysdk", "android_common", "",
@@ -609,35 +617,59 @@ func TestSnapshotWithJavaSystemModules(t *testing.T) {
 // This is auto-generated. DO NOT EDIT.
 
 java_import {
+    name: "mysdk_exported-system-module@current",
+    sdk_member_name: "exported-system-module",
+    jars: ["java/exported-system-module.jar"],
+}
+
+java_import {
+    name: "exported-system-module",
+    prefer: false,
+    jars: ["java/exported-system-module.jar"],
+}
+
+java_import {
     name: "mysdk_system-module@current",
     sdk_member_name: "system-module",
+    visibility: ["//visibility:private"],
     jars: ["java/system-module.jar"],
 }
 
 java_import {
-    name: "system-module",
+    name: "mysdk_system-module",
     prefer: false,
+    visibility: ["//visibility:private"],
     jars: ["java/system-module.jar"],
 }
 
 java_system_modules_import {
     name: "mysdk_my-system-modules@current",
     sdk_member_name: "my-system-modules",
-    libs: ["mysdk_system-module@current"],
+    libs: [
+        "mysdk_system-module@current",
+        "mysdk_exported-system-module@current",
+    ],
 }
 
 java_system_modules_import {
     name: "my-system-modules",
     prefer: false,
-    libs: ["system-module"],
+    libs: [
+        "mysdk_system-module",
+        "exported-system-module",
+    ],
 }
 
 sdk_snapshot {
     name: "mysdk@current",
+    java_header_libs: ["mysdk_exported-system-module@current"],
     java_system_modules: ["mysdk_my-system-modules@current"],
 }
 `),
-		checkAllCopyRules(".intermediates/system-module/android_common/turbine-combined/system-module.jar -> java/system-module.jar"),
+		checkAllCopyRules(`
+.intermediates/exported-system-module/android_common/turbine-combined/exported-system-module.jar -> java/exported-system-module.jar
+.intermediates/system-module/android_common/turbine-combined/system-module.jar -> java/system-module.jar
+`),
 	)
 }
 
@@ -677,14 +709,16 @@ func TestHostSnapshotWithJavaSystemModules(t *testing.T) {
 java_import {
     name: "mysdk_system-module@current",
     sdk_member_name: "system-module",
+    visibility: ["//visibility:private"],
     device_supported: false,
     host_supported: true,
     jars: ["java/system-module.jar"],
 }
 
 java_import {
-    name: "system-module",
+    name: "mysdk_system-module",
     prefer: false,
+    visibility: ["//visibility:private"],
     device_supported: false,
     host_supported: true,
     jars: ["java/system-module.jar"],
@@ -703,7 +737,7 @@ java_system_modules_import {
     prefer: false,
     device_supported: false,
     host_supported: true,
-    libs: ["system-module"],
+    libs: ["mysdk_system-module"],
 }
 
 sdk_snapshot {