summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author LaMont Jones <lamontjones@google.com> 2023-11-06 22:18:58 +0000
committer LaMont Jones <lamontjones@google.com> 2023-11-06 22:19:45 +0000
commit6f5f6867010dfa30d1a9fe933bc417327d9e065a (patch)
treeaa18a227c196905dafa281ff64f6423a02d8a366
parentea2cdf20ab4b7196211f172c951d210deee24c69 (diff)
Reapply "Set FLAG_DECLARATION_FILES value"
Have the release config map specify where to find build flag declarations, rather than having the logic in the build system. This reverts commit b737448b4441acc546b333bf251246ab0ffd4bb6. Bug: b/302593603, b/309477343 Test: manual Change-Id: Ic0f0ee94a16e5b6efe62df8362131625ece8507d
-rw-r--r--release_config_map.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/release_config_map.mk b/release_config_map.mk
index f92f76bb..544add47 100644
--- a/release_config_map.mk
+++ b/release_config_map.mk
@@ -12,6 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# FLAG_DECLARATION_FILES gives the path(s) of flag declaration files that
+# should be included in the build.
+FLAG_DECLARATION_FILES := build/release/build_flags.bzl
+
+# Attach the flag value definitions to the various release configurations.
$(call declare-release-config, next, build/release/build_config/next.bzl)
$(call declare-release-config, trunk, build/release/build_config/trunk.bzl)
$(call declare-release-config, trunk_food, build/release/build_config/trunk_food.bzl)