diff options
| -rw-r--r-- | build_config/next.scl (renamed from build_config/next.bzl) | 2 | ||||
| -rw-r--r-- | build_config/trunk.scl (renamed from build_config/trunk.bzl) | 4 | ||||
| -rw-r--r-- | build_config/trunk_food.scl (renamed from build_config/trunk_food.bzl) | 4 | ||||
| -rw-r--r-- | build_config/trunk_staging.scl (renamed from build_config/trunk_staging.bzl) | 4 | ||||
| -rw-r--r-- | build_config/trunk_versions.scl (renamed from build_config/trunk_versions.bzl) | 2 | ||||
| -rw-r--r-- | build_flags.scl (renamed from build_flags.bzl) | 2 | ||||
| -rw-r--r-- | release_config_map.mk | 12 |
7 files changed, 15 insertions, 15 deletions
diff --git a/build_config/next.bzl b/build_config/next.scl index e852933e..2a3e772a 100644 --- a/build_config/next.bzl +++ b/build_config/next.scl @@ -21,7 +21,7 @@ Build flag values for release config next. # See go/build-system-flags # -load("//build/make/core/release_config.bzl", "value") +load("//build/make/core/release_config.scl", "value") # Platform version variables platform_version_flags = [ diff --git a/build_config/trunk.bzl b/build_config/trunk.scl index 4c6dec8f..7909a63e 100644 --- a/build_config/trunk.bzl +++ b/build_config/trunk.scl @@ -21,8 +21,8 @@ Build flag values for release config trunk. # See go/build-system-flags # -load("//build/make/core/release_config.bzl", "value") -load("//build/release/build_config/trunk_versions.bzl", "platform_version_flags") +load("//build/make/core/release_config.scl", "value") +load("//build/release/build_config/trunk_versions.scl", "platform_version_flags") # Flags should be alphabetical by flag name to reduce merge conflifcts values = [ diff --git a/build_config/trunk_food.bzl b/build_config/trunk_food.scl index 7b4e2d90..92d587e0 100644 --- a/build_config/trunk_food.bzl +++ b/build_config/trunk_food.scl @@ -21,8 +21,8 @@ Build flag values for release config trunk_food. # See go/build-system-flags # -load("//build/make/core/release_config.bzl", "value") -load("//build/release/build_config/trunk_versions.bzl", "platform_version_flags") +load("//build/make/core/release_config.scl", "value") +load("//build/release/build_config/trunk_versions.scl", "platform_version_flags") # Flags should be alphabetical by flag name to reduce merge conflifcts values = [ diff --git a/build_config/trunk_staging.bzl b/build_config/trunk_staging.scl index 28af2b08..53f16f0a 100644 --- a/build_config/trunk_staging.bzl +++ b/build_config/trunk_staging.scl @@ -21,8 +21,8 @@ Build flag values for release config trunk_staging. # See go/build-system-flags # -load("//build/make/core/release_config.bzl", "value") -load("//build/release/build_config/trunk_versions.bzl", "platform_version_flags") +load("//build/make/core/release_config.scl", "value") +load("//build/release/build_config/trunk_versions.scl", "platform_version_flags") # Flags should be alphabetical by flag name to reduce merge conflifcts values = [ diff --git a/build_config/trunk_versions.bzl b/build_config/trunk_versions.scl index 974f41fe..c6a72823 100644 --- a/build_config/trunk_versions.bzl +++ b/build_config/trunk_versions.scl @@ -15,7 +15,7 @@ Common version flags used by all trunk based release configs. # See the License for the specific language governing permissions and # limitations under the License. -load("//build/make/core/release_config.bzl", "value") +load("//build/make/core/release_config.scl", "value") platform_version_flags = [ value("RELEASE_PLATFORM_VERSION", "ZP1A"), diff --git a/build_flags.bzl b/build_flags.scl index b436c8bd..ee659a66 100644 --- a/build_flags.bzl +++ b/build_flags.scl @@ -20,7 +20,7 @@ Build flag definitions. # This is for things that must be decided at compile time. load( - "//build/make/core/release_config.bzl", + "//build/make/core/release_config.scl", "ALL", "PRODUCT", # buildifier: disable=load "SYSTEM", # buildifier: disable=load diff --git a/release_config_map.mk b/release_config_map.mk index 544add47..ec354ee3 100644 --- a/release_config_map.mk +++ b/release_config_map.mk @@ -14,15 +14,15 @@ # 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 +FLAG_DECLARATION_FILES := build/release/build_flags.scl # 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) -$(call declare-release-config, trunk_staging, build/release/build_config/trunk_staging.bzl) +$(call declare-release-config, next, build/release/build_config/next.scl) +$(call declare-release-config, trunk, build/release/build_config/trunk.scl) +$(call declare-release-config, trunk_food, build/release/build_config/trunk_food.scl) +$(call declare-release-config, trunk_staging, build/release/build_config/trunk_staging.scl) # Temporary, until we remove the old "staging" configs -$(call declare-release-config, staging, build/release/build_config/trunk_staging.bzl) +$(call declare-release-config, staging, build/release/build_config/trunk_staging.scl) |