commit 670ccbebffa4dd88ed5dc52e22d54a4592f77828
author Xin Li <delphij@google.com> Mon Mar 24 10:27:46 2025 -0700
committer Xin Li <delphij@google.com> Mon Mar 24 14:30:29 2025 -0700
tree 326738d6a5497e5f7ec527590b7d87116714bad9
parent 577341036beabe1cf4dcc479b254b878b8963b8d

Fix build with aosp-main-with-vendor-blobs.

Bug: 395988167
Change-Id: I813ee84da03edd903c8aaec48b33887caf639b43

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 223305e..377d6e8 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -372,8 +372,8 @@
 $(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

diff --git a/tools/otatools_package/Android.bp b/tools/otatools_package/Android.bp
index f9d79d6..80e1e7d 100644
--- a/tools/otatools_package/Android.bp
+++ b/tools/otatools_package/Android.bp
@@ -174,7 +174,7 @@
         ":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"), {