commit b915fbd94c34c6e898141ab686232052e96fa383
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Dec 03 02:03:17 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 03 02:03:17 2024 +0000
tree 9acf0075f8ceec3bc696ee47538c70e1c3750d2d
parent 1d22fc1d2bfd9946e6a9fdf7ccf4e434fb90d203
parent 2adedef9cfc8206ed1b8dbf9a251eb2974663a4d

Merge "Correct a comment in flags.mk" into main

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 0dd91cc..d94fa15 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -497,6 +497,9 @@
 
   $(call add_json_list, ProductCopyFiles, $(PRODUCT_COPY_FILES))
 
+  # Used to generate fsv meta
+  $(call add_json_bool, ProductFsverityGenerateMetadata,               $(PRODUCT_FSVERITY_GENERATE_METADATA))
+
 $(call end_json_map)
 
 # For converting vintf_data

target/product/build_variables.mk

diff --git a/target/product/build_variables.mk b/target/product/build_variables.mk
index 7661e06..3326b87 100644
--- a/target/product/build_variables.mk
+++ b/target/product/build_variables.mk
@@ -20,6 +20,9 @@
 # Control libbinder client caching
 $(call soong_config_set, libbinder, release_libbinder_client_cache, $(RELEASE_LIBBINDER_CLIENT_CACHE))
 
+# Control caching while adding service in libbinder cache
+$(call soong_config_set, libbinder, release_libbinder_addservice_cache, $(RELEASE_LIBBINDER_ADDSERVICE_CACHE))
+
 # Use the configured release of sqlite
 $(call soong_config_set, libsqlite3, release_package_libsqlite3, $(RELEASE_PACKAGE_LIBSQLITE3))