Use AOSP's apksigner, not the SDK's

ted-xie · copybara-github · commit 809a417fa7c4 · 2024-01-23T10:16:41.000-08:00
The SDK version supports a different set of flags, and is also not a java binary. mobile-install invokes the apksigner with `java -jar apksigner_deploy.jar`. Part of #12 PiperOrigin-RevId: 600829305 Change-Id: Ic2d0b7468c17eee1d2f89ac2a430c660fcfa1d61
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -39,7 +39,7 @@ use_repo(
 )
 
 # python-related dependency setup
-bazel_dep(name = "rules_python", version = "0.26.0", repo_name = "rules_python")
+bazel_dep(name = "rules_python", version = "0.28.0", repo_name = "rules_python")
 
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
 python.toolchain(
@@ -96,3 +96,7 @@ bazel_binaries = use_extension(
 )
 bazel_binaries.download(version = "last_green")
 use_repo(bazel_binaries, "bazel_binaries")
+
+# extension for apksignerextensions
+apksig_extension = use_extension("//bzlmod_extensions:apksig.bzl", "apksig_extension")
+use_repo(apksig_extension, "apksig")
diff --git a/bzlmod_extensions/BUILD b/bzlmod_extensions/BUILD
@@ -0,0 +1,5 @@
+exports_files(
+    [
+        "apksig.BUILD",
+    ],
+)
diff --git a/bzlmod_extensions/apksig.BUILD b/bzlmod_extensions/apksig.BUILD
@@ -0,0 +1,19 @@
+# Defines targets for the apksigner build tool.
+load("@rules_java//java:defs.bzl", "java_binary", "java_library", "java_test")
+
+java_binary(
+    name = "apksigner",
+    srcs = glob(
+        ["**/*.java"],
+        exclude = [
+            "**/test/**",
+            "**/*Test.java",
+        ],
+    ),
+    main_class = "com.android.apksigner.ApkSignerTool",
+    visibility = ["//visibility:public"],
+    deps = [
+        "@rules_android_maven//:org_bouncycastle_bcprov_jdk18on",
+        "@rules_android_maven//:org_conscrypt_conscrypt_openjdk_uber",
+    ],
+)
diff --git a/bzlmod_extensions/apksig.bzl b/bzlmod_extensions/apksig.bzl
@@ -0,0 +1,31 @@
+# Copyright 2023 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Module extension to enable building apksigner."""
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+APKSIG_COMMIT = "24e3075e68ebe17c0b529bb24bfda819db5e2f3b"
+
+def apksig(_ctx = None):
+    # NOTE(b/317109605): Cannot depend on a stable sha256 hash for googlesource repositories.
+    http_archive(
+        name = "apksig",
+        url = "https://android.googlesource.com/platform/tools/apksig/+archive/%s.tar.gz" % APKSIG_COMMIT,
+        build_file = Label("//bzlmod_extensions:apksig.BUILD"),
+    )
+
+apksig_extension = module_extension(
+    implementation = apksig,
+)
diff --git a/defs.bzl b/defs.bzl
@@ -42,8 +42,10 @@ def rules_android_workspace():
             "androidx.privacysandbox.tools:tools-apipackager:1.0.0-alpha06",
             "androidx.test:core:1.6.0-alpha01",
             "androidx.test.ext:junit:1.2.0-alpha01",
+            "com.android.tools.build:apksig:8.3.0-alpha18",
             "com.android.tools.build:bundletool:1.15.5",
             "com.android.tools.build:gradle:8.2.0-alpha15",
+            "org.bouncycastle:bcprov-jdk18on:1.77",
             "org.hamcrest:hamcrest-core:2.2",
             "org.robolectric:robolectric:4.10.3",
             "com.google.guava:guava:32.1.2-jre",
diff --git a/mobile_install/tools.bzl b/mobile_install/tools.bzl
@@ -79,7 +79,7 @@ TOOL_ATTRS = dict(
         executable = True,
     ),
     _apk_signer = attr.label(
-        default = Label("@androidsdk//:apksigner"),
+        default = Label("@apksig//:apksigner_deploy.jar"),
         allow_files = True,
         cfg = "exec",
         executable = True,
diff --git a/prereqs.bzl b/prereqs.bzl
@@ -16,6 +16,7 @@
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+load("//bzlmod_extensions:apksig.bzl", _apksig_archive = "apksig")
 
 def rules_android_prereqs(dev_mode = False):
     """Downloads prerequisite repositories for rules_android."""
@@ -133,6 +134,8 @@ def rules_android_prereqs(dev_mode = False):
         sha256 = "84aec9e21cc56fbc7f1335035a71c850d1b9b5cc6ff497306f84cced9a769841",
     )
 
+    _apksig_archive()
+
     if dev_mode:
         maybe(
             http_archive,
diff --git a/rules_android_maven_install.json b/rules_android_maven_install.json
@@ -1,8 +1,8 @@
 {
     "dependency_tree": {
         "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-        "__INPUT_ARTIFACTS_HASH": -1817170305,
-        "__RESOLVED_ARTIFACTS_HASH": -541553829,
+        "__INPUT_ARTIFACTS_HASH": 634937897,
+        "__RESOLVED_ARTIFACTS_HASH": -634008848,
         "conflict_resolution": {
             "com.google.protobuf:protobuf-java-util:3.9.2": "com.google.protobuf:protobuf-java-util:3.19.3"
         },
@@ -635,31 +635,31 @@
                 "url": "https://maven.google.com/com/android/tools/build/aaptcompiler/8.2.0-alpha15/aaptcompiler-8.2.0-alpha15.jar"
             },
             {
-                "coord": "com.android.tools.build:apksig:8.2.0-alpha15",
+                "coord": "com.android.tools.build:apksig:8.3.0-alpha18",
                 "dependencies": [],
                 "directDependencies": [],
-                "file": "v1/https/maven.google.com/com/android/tools/build/apksig/8.2.0-alpha15/apksig-8.2.0-alpha15.jar",
+                "file": "v1/https/maven.google.com/com/android/tools/build/apksig/8.3.0-alpha18/apksig-8.3.0-alpha18.jar",
                 "mirror_urls": [
-                    "https://maven.google.com/com/android/tools/build/apksig/8.2.0-alpha15/apksig-8.2.0-alpha15.jar",
-                    "https://repo1.maven.org/maven2/com/android/tools/build/apksig/8.2.0-alpha15/apksig-8.2.0-alpha15.jar"
+                    "https://maven.google.com/com/android/tools/build/apksig/8.3.0-alpha18/apksig-8.3.0-alpha18.jar",
+                    "https://repo1.maven.org/maven2/com/android/tools/build/apksig/8.3.0-alpha18/apksig-8.3.0-alpha18.jar"
                 ],
                 "sha256": "468ee1852fa12461c6629608fe47be70e50f60be7c4744bb7f62ca48e85c0a6c",
-                "url": "https://maven.google.com/com/android/tools/build/apksig/8.2.0-alpha15/apksig-8.2.0-alpha15.jar"
+                "url": "https://maven.google.com/com/android/tools/build/apksig/8.3.0-alpha18/apksig-8.3.0-alpha18.jar"
             },
             {
                 "coord": "com.android.tools.build:apkzlib:8.2.0-alpha15",
                 "dependencies": [
                     "org.bouncycastle:bcprov-jdk15on:jar:1.67",
                     "com.google.guava:guava:32.1.2-jre",
                     "com.google.code.findbugs:jsr305:3.0.2",
-                    "com.android.tools.build:apksig:8.2.0-alpha15",
+                    "com.android.tools.build:apksig:8.3.0-alpha18",
                     "org.bouncycastle:bcpkix-jdk15on:1.67",
                     "org.bouncycastle:bcprov-jdk15on:1.67"
                 ],
                 "directDependencies": [
                     "com.google.guava:guava:32.1.2-jre",
                     "com.google.code.findbugs:jsr305:3.0.2",
-                    "com.android.tools.build:apksig:8.2.0-alpha15",
+                    "com.android.tools.build:apksig:8.3.0-alpha18",
                     "org.bouncycastle:bcpkix-jdk15on:1.67",
                     "org.bouncycastle:bcprov-jdk15on:1.67"
                 ],
@@ -741,6 +741,7 @@
                     "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0-Beta",
                     "org.glassfish.jaxb:txw2:2.3.2",
                     "com.android.tools.build:builder-model:8.2.0-alpha15",
+                    "com.android.tools.build:apksig:8.3.0-alpha18",
                     "com.android.tools.build:apkzlib:8.2.0-alpha15",
                     "jakarta.xml.bind:jakarta.xml.bind-api:2.3.2",
                     "org.ow2.asm:asm-commons:9.5",
@@ -758,7 +759,6 @@
                     "org.jvnet.staxex:stax-ex:1.8.1",
                     "xerces:xercesImpl:2.12.0",
                     "com.android.tools.analytics-library:shared:31.2.0-alpha15",
-                    "com.android.tools.build:apksig:8.2.0-alpha15",
                     "org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0-Beta",
                     "com.android.tools.build:builder-test-api:8.2.0-alpha15",
                     "com.android.tools.layoutlib:layoutlib-api:31.2.0-alpha15",
@@ -787,6 +787,7 @@
                     "com.android.tools:common:31.2.0-alpha15",
                     "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0-Beta",
                     "com.android.tools.build:builder-model:8.2.0-alpha15",
+                    "com.android.tools.build:apksig:8.3.0-alpha18",
                     "com.android.tools.build:apkzlib:8.2.0-alpha15",
                     "org.ow2.asm:asm-commons:9.5",
                     "commons-codec:commons-codec:1.11",
@@ -795,7 +796,6 @@
                     "com.android.tools.analytics-library:tracker:31.2.0-alpha15",
                     "com.android.tools.build:manifest-merger:31.2.0-alpha15",
                     "com.android.tools:sdk-common:31.2.0-alpha15",
-                    "com.android.tools.build:apksig:8.2.0-alpha15",
                     "com.android.tools.build:builder-test-api:8.2.0-alpha15",
                     "com.android.tools.layoutlib:layoutlib-api:31.2.0-alpha15",
                     "com.android.tools.analytics-library:protos:31.2.0-alpha15",
@@ -937,6 +937,7 @@
                     "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0-Beta",
                     "org.glassfish.jaxb:txw2:2.3.2",
                     "com.android.tools.build:builder-model:8.2.0-alpha15",
+                    "com.android.tools.build:apksig:8.3.0-alpha18",
                     "io.grpc:grpc-context:1.45.1",
                     "commons-io:commons-io:2.4",
                     "com.google.android:annotations:4.1.1.4",
@@ -975,7 +976,6 @@
                     "io.grpc:grpc-api:1.45.1",
                     "com.android.tools.build:gradle-api:8.2.0-alpha15",
                     "org.ow2.asm:asm:9.5",
-                    "com.android.tools.build:apksig:8.2.0-alpha15",
                     "org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0-Beta",
                     "com.android.tools.lint:lint-typedef-remover:31.2.0-alpha15",
                     "com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api",
@@ -1737,12 +1737,12 @@
                 "dependencies": [
                     "com.android.tools:annotations:31.2.0-alpha15",
                     "com.android:zipflinger:8.2.0-alpha15",
-                    "com.android.tools.build:apksig:8.2.0-alpha15"
+                    "com.android.tools.build:apksig:8.3.0-alpha18"
                 ],
                 "directDependencies": [
                     "com.android:zipflinger:8.2.0-alpha15",
                     "com.android.tools:annotations:31.2.0-alpha15",
-                    "com.android.tools.build:apksig:8.2.0-alpha15"
+                    "com.android.tools.build:apksig:8.3.0-alpha18"
                 ],
                 "file": "v1/https/maven.google.com/com/android/signflinger/8.2.0-alpha15/signflinger-8.2.0-alpha15.jar",
                 "mirror_urls": [
@@ -2839,16 +2839,16 @@
                 "url": "https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.67/bcprov-jdk15on-1.67.jar"
             },
             {
-                "coord": "org.bouncycastle:bcprov-jdk18on:1.72",
+                "coord": "org.bouncycastle:bcprov-jdk18on:1.77",
                 "dependencies": [],
                 "directDependencies": [],
-                "file": "v1/https/repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk18on/1.72/bcprov-jdk18on-1.72.jar",
+                "file": "v1/https/repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk18on/1.77/bcprov-jdk18on-1.77.jar",
                 "mirror_urls": [
-                    "https://maven.google.com/org/bouncycastle/bcprov-jdk18on/1.72/bcprov-jdk18on-1.72.jar",
-                    "https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk18on/1.72/bcprov-jdk18on-1.72.jar"
+                    "https://maven.google.com/org/bouncycastle/bcprov-jdk18on/1.77/bcprov-jdk18on-1.77.jar",
+                    "https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk18on/1.77/bcprov-jdk18on-1.77.jar"
                 ],
-                "sha256": "39287f2208a753db419f5ca529d6c80f094614aa74d790331126b3c9c6b85fda",
-                "url": "https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk18on/1.72/bcprov-jdk18on-1.72.jar"
+                "sha256": "dabb98c24d72c9b9f585633d1df9c5cd58d9ad373d0cd681367e6a603a495d58",
+                "url": "https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk18on/1.77/bcprov-jdk18on-1.77.jar"
             },
             {
                 "coord": "org.checkerframework:checker-qual:3.35.0",
@@ -3355,7 +3355,6 @@
                 "dependencies": [
                     "com.google.errorprone:error_prone_annotations:2.19.1",
                     "org.robolectric:nativeruntime:4.10.3",
-                    "org.bouncycastle:bcprov-jdk18on:1.72",
                     "androidx.test.espresso:espresso-idling-resource:aar:3.5.1",
                     "com.google.guava:guava:32.1.2-jre",
                     "org.robolectric:junit:4.10.3",
@@ -3378,13 +3377,13 @@
                     "org.robolectric:resources:4.10.3",
                     "org.robolectric:sandbox:4.10.3",
                     "javax.annotation:javax.annotation-api:1.3.2",
+                    "org.bouncycastle:bcprov-jdk18on:1.77",
                     "com.google.auto.value:auto-value-annotations:1.10.1",
                     "javax.inject:javax.inject:1",
                     "androidx.test:monitor:aar:1.7.0-alpha01",
                     "org.ow2.asm:asm-analysis:9.5"
                 ],
                 "directDependencies": [
-                    "org.bouncycastle:bcprov-jdk18on:1.72",
                     "androidx.test.espresso:espresso-idling-resource:aar:3.5.1",
                     "org.robolectric:junit:4.10.3",
                     "org.robolectric:pluginapi:4.10.3",
@@ -3397,6 +3396,7 @@
                     "org.robolectric:resources:4.10.3",
                     "org.robolectric:sandbox:4.10.3",
                     "javax.annotation:javax.annotation-api:1.3.2",
+                    "org.bouncycastle:bcprov-jdk18on:1.77",
                     "javax.inject:javax.inject:1",
                     "androidx.test:monitor:aar:1.7.0-alpha01"
                 ],

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ use_repo(`
`39`	`39`	`)`
`40`	`40`
`41`	`41`	`# python-related dependency setup`
`42`		`-bazel_dep(name = "rules_python", version = "0.26.0", repo_name = "rules_python")`
	`42`	`+bazel_dep(name = "rules_python", version = "0.28.0", repo_name = "rules_python")`
`43`	`43`
`44`	`44`	`python = use_extension("@rules_python//python/extensions:python.bzl", "python")`
`45`	`45`	`python.toolchain(`
`@@ -96,3 +96,7 @@ bazel_binaries = use_extension(`
`96`	`96`	`)`
`97`	`97`	`bazel_binaries.download(version = "last_green")`
`98`	`98`	`use_repo(bazel_binaries, "bazel_binaries")`
	`99`	`+`
	`100`	`+# extension for apksignerextensions`
	`101`	`+apksig_extension = use_extension("//bzlmod_extensions:apksig.bzl", "apksig_extension")`
	`102`	`+use_repo(apksig_extension, "apksig")`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +exports_files(
 +    [
 +        "apksig.BUILD",
 +    ],
 +)