From 2c20726d44708bdb739f4cd67e0d20332315fc8e Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Fri, 30 Aug 2024 18:56:39 +0000 Subject: Change visibility of module sdk prebuilts to //visibility:public To reduce pains introduced by visiblity skew between source and prebuilts, mark them with //visibility:public Bug: 239189932 Test: go test ./sdk Change-Id: I47dd63bd03337bc9ec6fa364bbdcdfdfcd70b0d9 --- sdk/sdk_test.go | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-) (limited to 'sdk/sdk_test.go') diff --git a/sdk/sdk_test.go b/sdk/sdk_test.go index 057b370d3..416dce62c 100644 --- a/sdk/sdk_test.go +++ b/sdk/sdk_test.go @@ -131,11 +131,7 @@ apex_contributions_defaults { java_import { name: "myjavalib", prefer: false, - visibility: [ - "//other/foo", - "//package", - "//prebuilts/mysdk", - ], + visibility: ["//visibility:public"], apex_available: ["//apex_available:platform"], jars: ["java/myjavalib.jar"], } @@ -151,11 +147,7 @@ java_import { java_import { name: "mydefaultedjavalib", prefer: false, - visibility: [ - "//other/bar", - "//package", - "//prebuilts/mysdk", - ], + visibility: ["//visibility:public"], apex_available: ["//apex_available:platform"], jars: ["java/mydefaultedjavalib.jar"], } @@ -163,10 +155,7 @@ java_import { java_import { name: "myprivatejavalib", prefer: false, - visibility: [ - "//package", - "//prebuilts/mysdk", - ], + visibility: ["//visibility:public"], apex_available: ["//apex_available:platform"], jars: ["java/myprivatejavalib.jar"], } @@ -185,28 +174,6 @@ func TestPrebuiltVisibilityProperty_IsValidated(t *testing.T) { `) } -func TestPrebuiltVisibilityProperty_AddPrivate(t *testing.T) { - testSdkError(t, `prebuilt_visibility: "//visibility:private" does not widen the visibility`, ` - sdk { - name: "mysdk", - prebuilt_visibility: [ - "//visibility:private", - ], - java_header_libs: [ - "myjavalib", - ], - } - - java_library { - name: "myjavalib", - // Uses package default visibility - srcs: ["Test.java"], - system_modules: "none", - sdk_version: "none", - } -`) -} - func TestSdkInstall(t *testing.T) { sdk := ` sdk { -- cgit v1.2.3-59-g8ed1b