summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ian Kasprzak <iankaz@google.com> 2024-10-02 17:31:22 +0000
committer Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 2024-10-02 17:31:22 +0000
commite22bf83b04c1cffe7e2fd1372d59d09ecc60e9ff (patch)
tree0b2261449393ccec0d117af16d25e18c61c204ed
parentd8fe3a49ece990cf010159f1d8440bcd62976488 (diff)
Move ap3a configuration to build/release.
Bug: 349843674 Bug: 370829778 Ignore-AOSP-First: "Migrating AP3A to build/release" Merged-In: Ie339d505c73b297e05f764c2c27cc525923fa225 Change-Id: Ie339d505c73b297e05f764c2c27cc525923fa225
-rw-r--r--target/product/generic_system.mk1
-rw-r--r--target/product/go_defaults.mk1
2 files changed, 2 insertions, 0 deletions
diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk
index 0a09eb11d4..b9a623dcd3 100644
--- a/target/product/generic_system.mk
+++ b/target/product/generic_system.mk
@@ -152,4 +152,5 @@ _my_paths := \
$(call require-artifacts-in-path, $(_my_paths), $(_my_allowed_list))
# Product config map to toggle between sources and prebuilts of required mainline modules
+PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard build/release/gms_mainline/required/release_config_map.textproto)
PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_shared/build/release/gms_mainline/required/release_config_map.textproto)
diff --git a/target/product/go_defaults.mk b/target/product/go_defaults.mk
index c9285307ab..ccc4f365e7 100644
--- a/target/product/go_defaults.mk
+++ b/target/product/go_defaults.mk
@@ -18,6 +18,7 @@
$(call inherit-product, build/make/target/product/go_defaults_common.mk)
# Product config map to toggle between sources and prebuilts of required mainline modules
+PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard build/release/gms_mainline_go/required/release_config_map.textproto)
PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_shared/build/release/gms_mainline_go/required/release_config_map.textproto)
# Add the system properties.