omni: Fix up aconfig pick up behavior
Change-Id: I809f2eb7232c1e3755a50467341bdb50a6ec3c7f
diff --git a/release/build_config/DEFAULT=proto b/release/build_config/DEFAULT=proto
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/release/build_config/DEFAULT=proto
diff --git a/release/build_config/ap3a.textproto b/release/build_config/ap3a.textproto
index 907fe07..11daabc 100644
--- a/release/build_config/ap3a.textproto
+++ b/release/build_config/ap3a.textproto
@@ -1,3 +1,6 @@
-name: "ap3a"
-prior_stages: "trunk"
-aconfig_value_sets: "aconfig_value_set-omnirom-ap3a"
+values: [
+ {
+ name: "RELEASE_ACONFIG_VALUE_SETS"
+ value: "aconfig_value_set-omnirom-ap3a"
+ }
+]
diff --git a/release/release_config_map.textproto b/release/release_config_map.textproto
index e3b00e7..905185b 100644
--- a/release/release_config_map.textproto
+++ b/release/release_config_map.textproto
@@ -5,5 +5,10 @@
release_config {
name: "ap3a"
+ flag_value_files: "release_configs/ap3a.textproto"
+}
+
+build_config {
+ name: "ap3a"
flag_value_files: "build_config/ap3a.textproto"
}
diff --git a/release/release_configs/ap3a.textproto b/release/release_configs/ap3a.textproto
new file mode 100644
index 0000000..907fe07
--- /dev/null
+++ b/release/release_configs/ap3a.textproto
@@ -0,0 +1,3 @@
+name: "ap3a"
+prior_stages: "trunk"
+aconfig_value_sets: "aconfig_value_set-omnirom-ap3a"