diff --git a/apex/apex.go b/apex/apex.go index 206466367..30515535a 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -3211,8 +3211,15 @@ func createApexPermittedPackagesRules(modules_packages map[string][]string) []an WithMatcher("permitted_packages", android.NotInList(module_packages)). WithMatcher("min_sdk_version", android.LessThanSdkVersion("Tiramisu")). Because("jars that are part of the " + module_name + - " module may only allow these packages: " + strings.Join(module_packages, ",") + - " with min_sdk < T. Please jarjar or move code around.") + " module may only use these package prefixes: " + strings.Join(module_packages, ",") + + " with min_sdk < T. Please consider the following alternatives:\n" + + " 1. If the offending code is from a statically linked library, consider " + + "removing that dependency and using an alternative already in the " + + "bootclasspath, or perhaps a shared library." + + " 2. Move the offending code into an allowed package.\n" + + " 3. Jarjar the offending code. Please be mindful of the potential system " + + "health implications of bundling that code, particularly if the offending jar " + + "is part of the bootclasspath.") rules = append(rules, permittedPackagesRule) } return rules diff --git a/apex/apex_test.go b/apex/apex_test.go index 7be88677c..c546fa13c 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -7464,7 +7464,7 @@ func TestApexPermittedPackagesRules(t *testing.T) { }, { name: "Bootclasspath apex jar not satisfying allowed module packages on Q.", - expectedError: `(?s)module "bcp_lib2" .* which is restricted because jars that are part of the myapex module may only allow these packages: foo.bar with min_sdk < T. Please jarjar or move code around.`, + expectedError: `(?s)module "bcp_lib2" .* which is restricted because jars that are part of the myapex module may only use these package prefixes: foo.bar with min_sdk < T. Please consider the following alternatives:\n 1. If the offending code is from a statically linked library, consider removing that dependency and using an alternative already in the bootclasspath, or perhaps a shared library. 2. Move the offending code into an allowed package.\n 3. Jarjar the offending code. Please be mindful of the potential system health implications of bundling that code, particularly if the offending jar is part of the bootclasspath.`, bp: ` java_library { name: "bcp_lib1", @@ -7501,7 +7501,7 @@ func TestApexPermittedPackagesRules(t *testing.T) { }, { name: "Bootclasspath apex jar not satisfying allowed module packages on R.", - expectedError: `(?s)module "bcp_lib2" .* which is restricted because jars that are part of the myapex module may only allow these packages: foo.bar with min_sdk < T. Please jarjar or move code around.`, + expectedError: `(?s)module "bcp_lib2" .* which is restricted because jars that are part of the myapex module may only use these package prefixes: foo.bar with min_sdk < T. Please consider the following alternatives:\n 1. If the offending code is from a statically linked library, consider removing that dependency and using an alternative already in the bootclasspath, or perhaps a shared library. 2. Move the offending code into an allowed package.\n 3. Jarjar the offending code. Please be mindful of the potential system health implications of bundling that code, particularly if the offending jar is part of the bootclasspath.`, bp: ` java_library { name: "bcp_lib1",