Skip to content

Fix generated manifest package name formatting #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
argahutama wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix generated manifest package name formatting #448

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions rules/resources.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
# limitations under the License.
"""Bazel Android Resources."""

load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
load("@rules_java//java/common:java_common.bzl", "java_common")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("//providers:providers.bzl", "AndroidLibraryResourceClassJarProvider", "ResourcesNodeInfo", "StarlarkAndroidResourcesInfo")
load("//rules:acls.bzl", "acls")
load("//rules:min_sdk_version.bzl", _min_sdk_version = "min_sdk_version")
load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
load("@rules_java//java/common:java_common.bzl", "java_common")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
load(":attrs.bzl", _attrs = "attrs")
load(":busybox.bzl", _busybox = "busybox")
load(":path.bzl", _path = "path")
Expand Down Expand Up @@ -178,9 +178,11 @@ def _generate_dummy_manifest(
out_manifest = None,
java_package = None,
min_sdk_version = 0):
sanitized_package = java_package.replace("-", ".").replace("/", ".") if java_package else "com.default"

content = """<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="%s">""" % (java_package or "com.default")
package="%s">""" % sanitized_package

min_sdk_version = max(min_sdk_version, _min_sdk_version.DEPOT_FLOOR)
content = content + """
Expand Down Expand Up @@ -1386,7 +1388,7 @@ def _process_starlark(
_generate_dummy_manifest(
ctx,
out_manifest = generated_manifest,
java_package = java_package if java_package else ctx.label.package.replace("/", "."),
java_package = java_package if java_package else ctx.label.package,
min_sdk_version = _min_sdk_version.DEPOT_FLOOR,
)
r_txt = ctx.actions.declare_file(ctx.label.name + "_symbols/R.txt")
Expand Down