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

Commit fc6ad614 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix build with aosp-main-with-vendor-blobs." into main am: d6e15269 

Original change: https://android-review.googlesource.com/c/platform/build/+/3558524



Change-Id: I7cc69c5a4d31a4fd9141033c457ad44c2c09250e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59116f28 d6e15269

core/android_soong_config_vars.mk

+2 −2
Original line number Diff line number Diff line
@@ -370,8 +370,8 @@ $(call soong_config_set_bool,GTVS,PRODUCT_USE_PREBUILT_GTVS,$(if $(findstring $( 
$(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)

ifneq ($(wildcard vendor/google/tools/build_mixed_kernels_ramdisk),)

  $(call soong_config_set_bool,otatools,use_build_mixed_kernels_ramdisk,true)

endif

ifneq ($(wildcard bootable/deprecated-ota/applypatch),)

  $(call soong_config_set_bool,otatools,use_bootable_deprecated_ota_applypatch,true)

tools/otatools_package/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ cc_genrule { 
        ":zip2zip",

        ":zipalign",

        ":zucchini",

    ] + select(soong_config_variable("otatools", "use_vendor_google_tools"), {

    ] + select(soong_config_variable("otatools", "use_build_mixed_kernels_ramdisk"), {

        true: [":build_mixed_kernels_ramdisk_host"],

        default: [],

    }) + select(soong_config_variable("otatools", "use_bootable_deprecated_ota_applypatch"), {