Merge changes from topic "aconfig-dump-format-and-filter-args" into main
* changes:
aconfig: dump --filter: implement predicates
aconfig: dump --filter: hook up command line args to dump.rs
aconfig: support custom `dump format` specs
diff --git a/core/Makefile b/core/Makefile
index 7d7457e..4a1cda1 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -5626,7 +5626,12 @@
FASTBOOT_INFO_VERSION = 1
INSTALLED_FASTBOOT_INFO_TARGET := $(PRODUCT_OUT)/fastboot-info.txt
-
+ifdef TARGET_BOARD_FASTBOOT_INFO_FILE
+$(INSTALLED_FASTBOOT_INFO_TARGET): $(TARGET_BOARD_FASTBOOT_INFO_FILE)
+ rm -f $@
+ $(call pretty,"Target fastboot-info.txt: $@")
+ $(hide) cp $< $@
+else
$(INSTALLED_FASTBOOT_INFO_TARGET):
rm -f $@
$(call pretty,"Target fastboot-info.txt: $@")
@@ -5685,6 +5690,7 @@
ifeq ($(BOARD_USES_METADATA_PARTITION),true)
$(hide) echo "if-wipe erase metadata" >> $@
endif
+endif
# -----------------------------------------------------------------
# misc_info.txt
diff --git a/tools/compliance/go.mod b/tools/compliance/go.mod
index 1928189..bd04077 100644
--- a/tools/compliance/go.mod
+++ b/tools/compliance/go.mod
@@ -26,4 +26,4 @@
// Indirect dep from go-cmp
exclude golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
-go 1.18
+go 1.21