Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02f11b21 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add bins and libs into the otatools.zip" into main

parents fa1e277c 54af9c2a
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -370,3 +370,11 @@ $(call soong_config_set_bool,GTVS,PRODUCT_USE_PREBUILT_GTVS,$(if $(findstring $(

# Flags used in GTVS_GTV prebuilt apps
$(call soong_config_set_bool,GTVS_GTV,PRODUCT_USE_PREBUILT_GTVS_GTV,$(if $(findstring $(PRODUCT_USE_PREBUILT_GTVS_GTV),true yes),true,false))

# 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
+156 −0
Original line number Diff line number Diff line
@@ -33,6 +33,160 @@ java_genrule_host {
    out: ["otatools_package_dep_jars.zip"],
}

cc_genrule {
    name: "otatools_package_dep_libs",
    host_supported: true,
    device_supported: false,
    compile_multilib: "first",
    tools: ["soong_zip"],
    cmd: "mkdir -p $(genDir)/$$CC_MULTILIB &&" +
        "cp $(in) $(genDir)/$$CC_MULTILIB && " +
        "$(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)/$$CC_MULTILIB",
    srcs: [
        ":libbase",
        ":libbrillo",
        ":libbrillo-stream",
        ":libc++",
        "//external/libchrome:libchrome",
        ":libconscrypt_openjdk_jni",
        ":libcrypto",
        ":libcrypto_utils",
        ":libcutils",
        ":libevent",
        ":libext2_blkid",
        ":libext2_com_err",
        ":libext2_e2p",
        ":libext2_quota",
        ":libext2_uuid",
        ":libext2fs",
        ":libext4_utils",
        ":libfec",
        ":libhidl-gen-utils",
        ":libhidlmetadata",
        ":libicui18n",
        ":libicuuc",
        ":liblog",
        ":liblp",
        ":liblz4",
        ":libpcre2",
        ":libprocessgroup",
        ":libprotobuf-cpp-lite",
        ":libselinux",
        ":libsparse",
        ":libsqlite",
        ":libsquashfs_utils",
        ":libssl",
        ":libz",
        ":libziparchive",
    ],
    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"],
@@ -40,7 +194,9 @@ java_genrule_host {
    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",
    ],
    // TODO: Rename as "otatools.zip" when the rest files are ready.