Merge "Add bins into the otatools.zip" into main
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index f57ec81..00fcb10 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -346,3 +346,11 @@
ifneq ($(filter arm x86 true,$(TARGET_ARCH) $(TARGET_2ND_ARCH) $(TARGET_ENABLE_MEDIADRM_64)),)
$(call soong_config_set_bool,ci_tests,uses_widevine_tests, true)
endif
+
+# Check modules to be built in "otatools-package".
+ifneq ($(wildcard vendor/google/tools),)
+ $(call soong_config_set_bool,otatools,use_vendor_google_tools,true)
+endif
+ifneq ($(wildcard bootable/deprecated-ota/applypatch),)
+ $(call soong_config_set_bool,otatools,use_bootable_deprecated_ota_applypatch,true)
+endif
diff --git a/tools/otatools_package/Android.bp b/tools/otatools_package/Android.bp
index ef8c867..d382a65 100644
--- a/tools/otatools_package/Android.bp
+++ b/tools/otatools_package/Android.bp
@@ -94,6 +94,111 @@
out: ["otatools_package_dep_libs.zip"],
}
+cc_genrule {
+ name: "otatools_package_dep_bins",
+ host_supported: true,
+ device_supported: false,
+ compile_multilib: "first",
+ tools: [
+ "apksigner",
+ "boot_signer",
+ "merge_zips",
+ "signapk",
+ "verity_signer",
+ ],
+ cmd: "mkdir -p $(genDir)/bin && " +
+ "cp $(in) $(genDir)/bin && " +
+ "cp $(location apksigner) $(location boot_signer) $(location merge_zips) $(location signapk) $(location verity_signer) $(genDir)/bin && " +
+ "$(location :soong_zip) -o $(out) -C $(genDir) -D $(genDir)/bin",
+ srcs: [
+ ":aapt2",
+ ":add_img_to_target_files",
+ ":apex_compression_tool",
+ ":apexd_host",
+ ":apexer",
+ ":append2simg",
+ ":avbtool",
+ ":blk_alloc_to_base_fs",
+ ":brillo_update_payload",
+ ":brotli",
+ ":bsdiff",
+ ":build_image",
+ ":build_super_image",
+ ":build_verity_metadata",
+ ":build_verity_tree",
+ ":care_map_generator",
+ ":check_ota_package_signature",
+ ":check_target_files_signatures",
+ ":check_target_files_vintf",
+ ":checkvintf",
+ ":create_brick_ota",
+ ":deapexer",
+ ":debugfs_static",
+ ":delta_generator",
+ ":e2fsck",
+ ":e2fsdroid",
+ ":fc_sort",
+ ":fec",
+ ":fs_config",
+ ":fsck.erofs",
+ ":fsck.f2fs",
+ ":generate_verity_key",
+ ":host_init_verifier",
+ ":img2simg",
+ ":img_from_target_files",
+ ":initrd_bootconfig",
+ ":lpmake",
+ ":lpunpack",
+ ":lz4",
+ ":make_f2fs",
+ ":make_f2fs_casefold",
+ ":merge_ota",
+ ":merge_target_files",
+ "//device/generic/goldfish:mk_combined_img",
+ ":mkbootfs",
+ ":mkbootimg",
+ ":mke2fs",
+ ":mkf2fsuserimg",
+ ":mkfs.erofs",
+ ":mksquashfs",
+ ":mksquashfsimage",
+ ":mkuserimg_mke2fs",
+ ":ota_extractor",
+ ":ota_from_target_files",
+ ":repack_bootimg",
+ ":resize2fs",
+ ":secilc",
+ ":sefcontext_compile",
+ ":sgdisk",
+ ":shflags",
+ ":sign_apex",
+ ":sign_target_files_apks",
+ ":sign_virt_apex",
+ ":simg2img",
+ ":sload_f2fs",
+ ":soong_zip",
+ ":toybox",
+ ":tune2fs",
+ ":unpack_bootimg",
+ ":update_device",
+ ":validate_target_files",
+ ":verity_verifier",
+ ":zip2zip",
+ ":zipalign",
+ ":zucchini",
+ ] + select(soong_config_variable("otatools", "use_vendor_google_tools"), {
+ true: [":build_mixed_kernels_ramdisk_host"],
+ default: [],
+ }) + select(soong_config_variable("otatools", "use_bootable_deprecated_ota_applypatch"), {
+ true: [
+ ":imgdiff",
+ ":update_host_simulator",
+ ],
+ default: [],
+ }),
+ out: ["otatools_package_dep_bins.zip"],
+}
+
java_genrule_host {
name: "otatools_package",
tools: ["merge_zips"],
@@ -101,6 +206,7 @@
cmd: "$(location merge_zips) $(out) $(in)",
srcs: [
":otatools_package_cert_files",
+ ":otatools_package_dep_bins",
":otatools_package_dep_jars",
":otatools_package_dep_libs",
":otatools_package_releasetools",