Merge "Enable Credential Manager for all handheld devices" into main
diff --git a/core/base_rules.mk b/core/base_rules.mk
index 0d72903..a8cf67e 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -717,12 +717,14 @@
endif
ifeq ($(EXCLUDE_MCTS),true)
+ifeq (,$(filter $(LOCAL_MODULE),$(mcts_whitelist)))
ifneq (,$(test_config))
ifneq (,$(filter mcts-%,$(LOCAL_COMPATIBILITY_SUITE)))
LOCAL_COMPATIBILITY_SUITE := $(filter-out cts,$(LOCAL_COMPATIBILITY_SUITE))
endif
endif
endif
+endif
ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))
diff --git a/core/soong_extra_config.mk b/core/soong_extra_config.mk
index c2b4775..e4432d2 100644
--- a/core/soong_extra_config.mk
+++ b/core/soong_extra_config.mk
@@ -91,6 +91,8 @@
$(call add_json_str, VendorSecurityPatch, $(VENDOR_SECURITY_PATCH))
$(call add_json_str, VendorImageFileSystemType, $(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE))
+$(call add_json_list, BuildVersionTags, $(BUILD_VERSION_TAGS))
+
$(call json_end)
$(shell mkdir -p $(dir $(SOONG_EXTRA_VARIABLES)))
diff --git a/core/tasks/meta-lic.mk b/core/tasks/meta-lic.mk
index 3520a32..85357eb 100644
--- a/core/tasks/meta-lic.mk
+++ b/core/tasks/meta-lic.mk
@@ -188,3 +188,6 @@
# Moved here from packages/services/Car/Android.mk
$(eval $(call declare-1p-copy-files,packages/services/Car,))
+
+# Moved here from hardware/libhardware_legacy/Android.mk
+$(eval $(call declare-1p-copy-files,hardware/libhardware_legacy,))
diff --git a/tools/aconfig/aconfig_storage_read_api/Android.bp b/tools/aconfig/aconfig_storage_read_api/Android.bp
index 5e9eb54..eb7127b 100644
--- a/tools/aconfig/aconfig_storage_read_api/Android.bp
+++ b/tools/aconfig/aconfig_storage_read_api/Android.bp
@@ -85,7 +85,7 @@
"libcxx_aconfig_storage_read_api_bridge_header",
],
generated_sources: ["libcxx_aconfig_storage_read_api_bridge_code"],
- whole_static_libs: ["libaconfig_storage_read_api_cxx_bridge"],
+ static_rlibs: ["libaconfig_storage_read_api_cxx_bridge"],
export_include_dirs: ["include"],
host_supported: true,
vendor_available: true,