Change Starlark custom_package fallback default behavior to false, and allow None value for custom_package.

PiperOrigin-RevId: 410794963

3 files changed, 8 insertions, 22 deletions

diff --git a/rules/busybox.bzl b/rules/busybox.bzl
index 26d76a1..a92fe68 100644
--- a/rules/busybox.bzl
+++ b/rules/busybox.bzl
@@ -380,7 +380,8 @@ def _package(
         args.add("--versionName", version_name)
     if version_code:
         args.add("--versionCode", version_code)
-    args.add("--packageForR", java_package)
+    if java_package:
+        args.add("--packageForR", java_package)
 
     _java.run(
         ctx = ctx,
@@ -821,7 +822,8 @@ def _merge_manifests(
             ",".join(["%s:%s" % (_escape_mv(k), _escape_mv(v)) for k, v in manifest_values.items()]),
         )
     args.add("--mergeType", merge_type)
-    args.add("--customPackage", java_package)
+    if java_package:
+        args.add("--customPackage", java_package)
     args.add("--manifestOutput", out_file)
     if out_log_file:
         args.add("--log", out_log_file)
@@ -928,7 +930,8 @@ def _generate_binary_r(
     args.add("--")
     args.add("--primaryRTxt", r_txt)
     args.add("--primaryManifest", manifest)
-    args.add("--packageForR", package_for_r)
+    if package_for_r:
+        args.add("--packageForR", package_for_r)
     args.add_all(
         resources_nodes,
         map_each = _make_generate_binay_r_flags,
diff --git a/rules/java.bzl b/rules/java.bzl
index 8193bdf..2e2fc58 100644
--- a/rules/java.bzl
+++ b/rules/java.bzl
@@ -88,8 +88,7 @@ def _resolve_package(path):
 
 def _resolve_package_from_label(
         label,
-        custom_package = None,
-        fallback = True):
+        custom_package = None):
     """Resolves the Java package from a Label.
 
     When no legal Java package can be resolved from the label, None will be
@@ -110,15 +109,7 @@ def _resolve_package_from_label(
         [label.package] +
         _path.split(label.name)[:-1],
     )
-    java_package = _resolve_package(label_path)
-
-    if java_package != None:  # "" is a valid result.
-        return java_package
-
-    if fallback:
-        return label.package.replace("/", ".")
-
-    return None
+    return _resolve_package(label_path)
 
 def _root(path):
     """Determines the Java root from the given path.
diff --git a/rules/resources.bzl b/rules/resources.bzl
index a6578da..158a9c0 100644
--- a/rules/resources.bzl
+++ b/rules/resources.bzl
@@ -60,11 +60,6 @@ _ASSET_DEFINITION_ERROR = (
     "both empty or non-empty."
 )
 
-_JAVA_PACKAGE_MISSING_ERROR = (
-    "In target %s, a java package is required when stamping " +
-    "the manifest."
-)
-
 _INCORRECT_RESOURCE_LAYOUT_ERROR = (
     "'%s' is not in the expected resource directory structure of " +
     "<resource directory>/{%s}/<file>" % (",").join(_RESOURCE_FOLDER_TYPES)
@@ -1100,9 +1095,6 @@ def _process_starlark(
     if resource_files and not manifest:
         _log.error(_MANIFEST_MISSING_ERROR % ctx.label)
 
-    if stamp_manifest and not java_package:
-        _log.error(_JAVA_PACKAGE_MISSING_ERROR % ctx.label)
-
     direct_resources_nodes = []
     transitive_resources_nodes = []
     transitive_assets = []