Merge "java FlagImpl: Clear context into Provider" into main
diff --git a/core/product_config.mk b/core/product_config.mk
index 3e1f120..abe6e38 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -424,10 +424,12 @@
endif
endif
-$(foreach pair,$(PRODUCT_APEX_BOOT_JARS), \
- $(eval jar := $(call word-colon,2,$(pair))) \
- $(if $(findstring $(jar), $(PRODUCT_BOOT_JARS)), \
- $(error A jar in PRODUCT_APEX_BOOT_JARS must not be in PRODUCT_BOOT_JARS, but $(jar) is)))
+$(foreach apexpair,$(PRODUCT_APEX_BOOT_JARS), \
+ $(foreach platformpair,$(PRODUCT_BOOT_JARS), \
+ $(eval apexjar := $(call word-colon,2,$(apexpair))) \
+ $(eval platformjar := $(call word-colon,2,$(platformpair))) \
+ $(if $(filter $(apexjar), $(platformjar)), \
+ $(error A jar in PRODUCT_APEX_BOOT_JARS must not be in PRODUCT_BOOT_JARS, but $(apexjar) is))))
ENFORCE_SYSTEM_CERTIFICATE := $(PRODUCT_ENFORCE_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT)
ENFORCE_SYSTEM_CERTIFICATE_ALLOW_LIST := $(PRODUCT_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT_ALLOW_LIST)
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 5bdf0f1..c0641de 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -441,6 +441,10 @@
$(call add_json_bool, BuildingSystemDlkmImage, $(BUILDING_SYSTEM_DLKM_IMAGE))
$(call add_json_list, SystemKernelModules, $(BOARD_SYSTEM_KERNEL_MODULES))
+ # Used to generate /vendor/build.prop
+ $(call add_json_list, BoardInfoFiles, $(if $(TARGET_BOARD_INFO_FILES),$(TARGET_BOARD_INFO_FILES),$(firstword $(TARGET_BOARD_INFO_FILE) $(wildcard $(TARGET_DEVICE_DIR)/board-info.txt))))
+ $(call add_json_str, BootLoaderBoardName, $(TARGET_BOOTLOADER_BOARD_NAME))
+
$(call add_json_map, ProductCopyFiles)
$(foreach pair,$(PRODUCT_COPY_FILES),\
$(call add_json_str,$(word 1,$(subst :, ,$(pair))),$(word 2,$(subst :, ,$(pair)))))
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 3a8eb72..0f34cfe 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -18,7 +18,6 @@
PRODUCT_PACKAGES += \
abx \
aconfigd \
- aconfigd-system \
adbd_system_api \
aflags \
am \
@@ -97,6 +96,7 @@
enhanced-confirmation.xml \
ExtShared \
flags_health_check \
+ framework-connectivity-b \
framework-graphics \
framework-location \
framework-minus-apex \
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 668f054..83d9215 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -51,6 +51,7 @@
framework-minus-apex \
framework-graphics \
framework-location \
+ framework-connectivity-b \
ext \
telephony-common \
voip-common \
diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp
index 80b84de..c81e66c 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -379,7 +379,6 @@
deps: [
"abx",
"aconfigd",
- "aconfigd-system",
"aflags",
"am",
"android.software.credentials.prebuilt.xml", // generic_system
@@ -702,6 +701,7 @@
"framework-graphics", // base_system
"framework-location", // base_system
"framework-minus-apex-install-dependencies", // base_system
+ "framework-connectivity-b", // base_system
"framework_compatibility_matrix.device.xml",
"generic_system_fonts", // ok
"hwservicemanager_compat_symlink_module", // base_system