commit 638472caa8e4b476acca3727ab97da5143b51588
author Cole Faust <colefaust@google.com> Thu Nov 25 01:27:02 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 25 01:27:02 2021 +0000
tree d43960830da5349d34d21bd21bdfa5c5fa21fa2b
parent 2694a33cb6d19dc302552dc0f46c5120294ed363
parent 7d9103b390f425777ee53f7ac607063d2b1eacf6

Merge "Change type of TARGET_BUILD_APPS from bool to list" am: 7d9103b390

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

Change-Id: Ib21e3dc644b5930403dd42c7a47a01b916cb918b

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 837ed4f..a48b4d8 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -37,7 +37,7 @@
 
 $(call add_json_bool, Allow_missing_dependencies,        $(filter true,$(ALLOW_MISSING_DEPENDENCIES)))
 $(call add_json_bool, Unbundled_build,                   $(TARGET_BUILD_UNBUNDLED))
-$(call add_json_bool, Unbundled_build_apps,              $(TARGET_BUILD_APPS))
+$(call add_json_list, Unbundled_build_apps,              $(TARGET_BUILD_APPS))
 $(call add_json_bool, Unbundled_build_image,             $(TARGET_BUILD_UNBUNDLED_IMAGE))
 $(call add_json_bool, Always_use_prebuilt_sdks,          $(TARGET_BUILD_USE_PREBUILT_SDKS))