diff options
author | 2024-05-13 09:53:59 -0700 | |
---|---|---|
committer | 2024-05-13 09:53:59 -0700 | |
commit | 1beb95cbd8edadebfa2d707c6eaa37bc75d1996b (patch) | |
tree | 329c68c423e4e9e1be1da10e701a65c8408852e5 /build_config | |
parent | 46a1236a3ebde01856e5426f5ccffad8a0d29d5a (diff) |
Drop next, trunk, and trunk_food from build/release
These release configs are found in vendor/google_shared/build/release.
Bug: 328495189
Test: manual
Ignore-AOSP-First: will reconcile
Change-Id: Ib02fc4dea3a6d96adb4a0d2b6a732249373844d9
Diffstat (limited to 'build_config')
-rw-r--r-- | build_config/next.scl | 86 | ||||
-rw-r--r-- | build_config/protobuf_flags.scl | 39 | ||||
-rw-r--r-- | build_config/protobuf_flags=proto | 0 | ||||
-rw-r--r-- | build_config/trunk.scl | 91 | ||||
-rw-r--r-- | build_config/trunk_food.scl | 36 |
5 files changed, 0 insertions, 252 deletions
diff --git a/build_config/next.scl b/build_config/next.scl deleted file mode 100644 index 7f99c87d..00000000 --- a/build_config/next.scl +++ /dev/null @@ -1,86 +0,0 @@ -""" -Build flag values for release config next. -""" -# Copyright (C) 2023 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Build system flag configuration for `lunch <product>-next-<variant>` builds -# ^^^^ -# See go/build-system-flags -# - -load("//build/make/core/release_config.scl", "value") - -# Flags should be alphabetical by flag name to reduce merge conflifcts -values = [ - # keep-sorted start numeric=yes - value("RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION", "READ_ONLY"), - value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-aosp-next"), - value("RELEASE_AIDL_USE_UNFROZEN", False), - value("RELEASE_AVATAR_PICKER_APP", True), - value("RELEASE_AVF_ALLOW_PREINSTALLED_APPS", True), - value("RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT", True), - value("RELEASE_AVF_ENABLE_DICE_CHANGES", True), - value("RELEASE_AVF_ENABLE_LLPVM_CHANGES", True), - value("RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM", True), - value("RELEASE_AVF_ENABLE_REMOTE_ATTESTATION", True), - value("RELEASE_AVF_ENABLE_VENDOR_MODULES", True), - value("RELEASE_AVF_ENABLE_VIRT_CPUFREQ", True), - value("RELEASE_AVF_MICRODROID_KERNEL_VERSION", "android15_66"), - value("RELEASE_BOARD_API_LEVEL", "202404"), - value("RELEASE_DEPRECATE_VNDK", True), - value("RELEASE_KERNEL_BLUEJAY_DIR", "device/google/bluejay-kernels/5.10/24Q3-11765480"), - value("RELEASE_KERNEL_BLUEJAY_VERSION", "5.10"), - value("RELEASE_KERNEL_CHEETAH_DIR", "device/google/pantah-kernels/5.10/24Q3-11765480"), - value("RELEASE_KERNEL_CHEETAH_VERSION", "5.10"), - value("RELEASE_KERNEL_FELIX_DIR", "device/google/felix-kernels/5.10/24Q3-11765480"), - value("RELEASE_KERNEL_FELIX_VERSION", "5.10"), - value("RELEASE_KERNEL_HUSKY_DIR", "device/google/shusky-kernels/5.15/24Q3-11791196"), - value("RELEASE_KERNEL_HUSKY_VERSION", "5.15"), - value("RELEASE_KERNEL_LYNX_DIR", "device/google/lynx-kernels/5.10/24Q3-11765480"), - value("RELEASE_KERNEL_LYNX_VERSION", "5.10"), - value("RELEASE_KERNEL_ORIOLE_DIR", "device/google/raviole-kernels/5.10/24Q3-11765480"), - value("RELEASE_KERNEL_ORIOLE_VERSION", "5.10"), - value("RELEASE_KERNEL_PANTHER_DIR", "device/google/pantah-kernels/5.10/24Q3-11765480"), - value("RELEASE_KERNEL_PANTHER_VERSION", "5.10"), - value("RELEASE_KERNEL_RAVEN_DIR", "device/google/raviole-kernels/5.10/24Q3-11765480"), - value("RELEASE_KERNEL_RAVEN_VERSION", "5.10"), - value("RELEASE_KERNEL_RIPCURRENT_DIR", "device/google/shusky-kernels/5.15/24Q3-11791196"), - value("RELEASE_KERNEL_RIPCURRENT_VERSION", "5.15"), - value("RELEASE_KERNEL_SHIBA_DIR", "device/google/shusky-kernels/5.15/24Q3-11791196"), - value("RELEASE_KERNEL_SHIBA_VERSION", "5.15"), - value("RELEASE_KERNEL_TANGORPRO_DIR", "device/google/tangorpro-kernels/5.10/24Q3-11765480"), - value("RELEASE_KERNEL_TANGORPRO_VERSION", "5.10"), - value("RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION", "2.042"), - value("RELEASE_PACKAGE_HENTAIGANA_FONT", True), - value("RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES", True), - value("RELEASE_PACKAGE_LIBSQLITE3", "3440300"), - value("RELEASE_PACKAGE_NFC_STACK", "com.android.nfcservices"), - value("RELEASE_PACKAGE_PROFILING_MODULE", True), - value("RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK", True), - value("RELEASE_PACKAGE_VIRTUAL_CAMERA", "virtual_camera"), - value("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", "12"), - value("RELEASE_PLATFORM_SDK_VERSION", "34"), - value("RELEASE_PLATFORM_SECURITY_PATCH", "2024-06-05"), - value("RELEASE_PLATFORM_VERSION", "UP1A"), - value("RELEASE_PLATFORM_VERSION_ALL_CODENAMES", "REL"), - value("RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES", "REL,VanillaIceCream"), - value("RELEASE_PLATFORM_VERSION_CODENAME", "REL"), - value("RELEASE_PLATFORM_VERSION_LAST_STABLE", "14"), - value("RELEASE_PLATFORM_VNDK_VERSION", "35"), - value("RELEASE_REMOVE_LEGACY_EMOJI_FONT", "True"), - # keep-sorted end -] -# Flags should be alphabetical by flag name to reduce merge conflifcts diff --git a/build_config/protobuf_flags.scl b/build_config/protobuf_flags.scl deleted file mode 100644 index 9c0c7967..00000000 --- a/build_config/protobuf_flags.scl +++ /dev/null @@ -1,39 +0,0 @@ -""" -Build flag values for release config protobuf_flags. -""" -# Copyright (C) 2023 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Build system flag configuration for `lunch <product>-protobuf_flags-<variant>` builds -# ^^^^^^^^^^^^^^ -# See go/build-system-flags -# - -load("//build/make/core/release_config.scl", "value") - -################################################################################ -# -# DO NOT EDIT THIS FILE -# -# Flag values should be changed in `trunk_staging.scl`, not here. This file should -# only be used where protobuf_flags differs from trunk_staging: -# RELEASE_BUILD_FLAGS_IN_PROTOBUF is the only difference at this time. -################################################################################ -values = [ - # keep-sorted start numeric=yes - value("RELEASE_BUILD_FLAGS_IN_PROTOBUF", True), - # keep-sorted end -] -# Flags should be alphabetical by flag name to reduce merge conflifcts diff --git a/build_config/protobuf_flags=proto b/build_config/protobuf_flags=proto deleted file mode 100644 index e69de29b..00000000 --- a/build_config/protobuf_flags=proto +++ /dev/null diff --git a/build_config/trunk.scl b/build_config/trunk.scl deleted file mode 100644 index f62b58a4..00000000 --- a/build_config/trunk.scl +++ /dev/null @@ -1,91 +0,0 @@ -""" -Build flag values for release config trunk. -""" -# Copyright (C) 2023 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Build system flag configuration for `lunch <product>-trunk-<variant>` builds -# ^^^^^ -# See go/build-system-flags -# - -load("//build/make/core/release_config.scl", "value") - -# Flags should be alphabetical by flag name to reduce merge conflifcts -values = [ - # keep-sorted start numeric=yes - value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-aosp-trunk"), - value("RELEASE_AVATAR_PICKER_APP", True), - value("RELEASE_AVF_ALLOW_PREINSTALLED_APPS", True), - value("RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT", True), - value("RELEASE_AVF_ENABLE_DICE_CHANGES", True), - value("RELEASE_AVF_ENABLE_LLPVM_CHANGES", True), - value("RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM", True), - value("RELEASE_AVF_ENABLE_REMOTE_ATTESTATION", True), - value("RELEASE_AVF_ENABLE_VENDOR_MODULES", True), - value("RELEASE_AVF_ENABLE_VIRT_CPUFREQ", True), - value("RELEASE_AVF_MICRODROID_KERNEL_VERSION", "android15_66"), - value("RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI", True), - value("RELEASE_BOARD_API_LEVEL", "202504"), - value("RELEASE_CRASHRECOVERY_MODULE", True), - value("RELEASE_CREATE_ACONFIG_STORAGE_FILE", True), - value("RELEASE_DEPRECATE_VNDK", True), - value("RELEASE_KERNEL_BLUEJAY_DIR", "device/google/bluejay-kernels/5.10/trunk-11768877"), - value("RELEASE_KERNEL_BLUEJAY_VERSION", "5.10"), - value("RELEASE_KERNEL_CHEETAH_DIR", "device/google/pantah-kernels/5.10/trunk-11768877"), - value("RELEASE_KERNEL_CHEETAH_VERSION", "5.10"), - value("RELEASE_KERNEL_FELIX_DIR", "device/google/felix-kernels/5.10/trunk-11768877"), - value("RELEASE_KERNEL_FELIX_VERSION", "5.10"), - value("RELEASE_KERNEL_HUSKY_DIR", "device/google/shusky-kernels/5.15/trunk-11782637"), - value("RELEASE_KERNEL_HUSKY_VERSION", "5.15"), - value("RELEASE_KERNEL_LYNX_DIR", "device/google/lynx-kernels/5.10/trunk-11768877"), - value("RELEASE_KERNEL_LYNX_VERSION", "5.10"), - value("RELEASE_KERNEL_ORIOLE_DIR", "device/google/raviole-kernels/5.10/trunk-11768877"), - value("RELEASE_KERNEL_ORIOLE_VERSION", "5.10"), - value("RELEASE_KERNEL_PANTHER_DIR", "device/google/pantah-kernels/5.10/trunk-11768877"), - value("RELEASE_KERNEL_PANTHER_VERSION", "5.10"), - value("RELEASE_KERNEL_RAVEN_DIR", "device/google/raviole-kernels/5.10/trunk-11768877"), - value("RELEASE_KERNEL_RAVEN_VERSION", "5.10"), - value("RELEASE_KERNEL_RIPCURRENT_DIR", "device/google/shusky-kernels/5.15/trunk-11782637"), - value("RELEASE_KERNEL_RIPCURRENT_VERSION", "5.15"), - value("RELEASE_KERNEL_SHIBA_DIR", "device/google/shusky-kernels/5.15/trunk-11782637"), - value("RELEASE_KERNEL_SHIBA_VERSION", "5.15"), - value("RELEASE_KERNEL_TANGORPRO_DIR", "device/google/tangorpro-kernels/5.10/trunk-11768877"), - value("RELEASE_KERNEL_TANGORPRO_VERSION", "5.10"), - value("RELEASE_LARGE_SYSTEM_PROPERTY_NODE", True), - value("RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION", "2.042"), - value("RELEASE_PACKAGE_HENTAIGANA_FONT", True), - value("RELEASE_PACKAGE_LIBANDROID_RUNTIME_PUNCH_HOLES", True), - value("RELEASE_PACKAGE_LIBSQLITE3", "3440300"), - value("RELEASE_PACKAGE_NFC_STACK", "com.android.nfcservices"), - value("RELEASE_PACKAGE_PROFILING_MODULE", True), - value("RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK", True), - value("RELEASE_PACKAGE_VIRTUAL_CAMERA", "virtual_camera"), - value("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", "12"), - value("RELEASE_PLATFORM_SDK_VERSION", "34"), - value("RELEASE_PLATFORM_SECURITY_PATCH", "2024-06-05"), - value("RELEASE_PLATFORM_VERSION", "ZP1A"), - value("RELEASE_PLATFORM_VERSION_ALL_CODENAMES", "VanillaIceCream"), - value("RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES", "VanillaIceCream"), - value("RELEASE_PLATFORM_VERSION_CODENAME", "VanillaIceCream"), - value("RELEASE_PLATFORM_VERSION_LAST_STABLE", "14"), - value("RELEASE_PLATFORM_VNDK_VERSION", "35"), - value("RELEASE_REMOVE_LEGACY_EMOJI_FONT", True), - value("RELEASE_SELINUX_DATA_DATA_IGNORE", True), - value("RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL", True), - value("RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES", True), - # keep-sorted end -] -# Flags should be alphabetical by flag name to reduce merge conflifcts diff --git a/build_config/trunk_food.scl b/build_config/trunk_food.scl deleted file mode 100644 index 54a296dc..00000000 --- a/build_config/trunk_food.scl +++ /dev/null @@ -1,36 +0,0 @@ -""" -Build flag values for release config trunk_food. -""" -# Copyright (C) 2023 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Build system flag configuration for `lunch <product>-trunk_food-<variant>` builds -# ^^^^^^^^^^ -# See go/build-system-flags -# - -load("//build/make/core/release_config.scl", "value") - -################################################################################ -# -# DO NOT EDIT THIS FILE -# -# Flag values should be changed in `trunk.scl`, not here. This file should -# only be used where trunk_food differs from trunk: RELEASE_ACONFIG_VALUE_SETS -# is the only difference at this time. -################################################################################ -values = [ - value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-aosp-trunk_food"), -] |