diff options
| author | 2025-03-24 16:04:26 -0700 | |
|---|---|---|
| committer | 2025-03-24 16:04:26 -0700 | |
| commit | fc6ad61428e326f15c920ccaee7d7b43fc63d58a (patch) | |
| tree | eda4b8bef8291f120daa54e867d824246a04630a | |
| parent | 59116f28ce140aee04cadb2981d244a3e2b7663d (diff) | |
| parent | d6e15269ce4149fc1e90cca597da5d2a6b9f981f (diff) | |
Merge "Fix build with aosp-main-with-vendor-blobs." into main am: d6e15269ce
Original change: https://android-review.googlesource.com/c/platform/build/+/3558524
Change-Id: I7cc69c5a4d31a4fd9141033c457ad44c2c09250e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/android_soong_config_vars.mk | 4 | ||||
| -rw-r--r-- | tools/otatools_package/Android.bp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 3c30e29e53..59b6467b47 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -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) diff --git a/tools/otatools_package/Android.bp b/tools/otatools_package/Android.bp index f9d79d6039..80e1e7d964 100644 --- a/tools/otatools_package/Android.bp +++ b/tools/otatools_package/Android.bp @@ -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"), { |