diff options
| author | 2024-05-10 17:31:40 +0000 | |
|---|---|---|
| committer | 2024-05-10 17:31:40 +0000 | |
| commit | 39a297faeb4325d3c67d28002275bb0da6c5b301 (patch) | |
| tree | 47d00aa18f21b5d6d8fe2c17c6e6517b3cc91daa /build_config | |
| parent | f96fccea773a7654d2988d0c926dc65068f9abd0 (diff) | |
| parent | 390a0cf9e345e976b314089c6932284a342afaac (diff) | |
Merge "Revert "Require protobuf except for ap2a"" into main
Diffstat (limited to 'build_config')
| -rw-r--r-- | build_config/DEFAULT=proto | 0 | ||||
| -rw-r--r-- | build_config/ap2a.scl | 1 | ||||
| -rw-r--r-- | build_config/ap2a=make | 0 | ||||
| -rw-r--r-- | build_config/fail.scl | 24 |
4 files changed, 0 insertions, 25 deletions
diff --git a/build_config/DEFAULT=proto b/build_config/DEFAULT=proto deleted file mode 100644 index e69de29b..00000000 --- a/build_config/DEFAULT=proto +++ /dev/null diff --git a/build_config/ap2a.scl b/build_config/ap2a.scl index d82ebfe9..460120dc 100644 --- a/build_config/ap2a.scl +++ b/build_config/ap2a.scl @@ -30,7 +30,6 @@ values = [ value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-aosp-ap2a"), value("RELEASE_AIDL_USE_UNFROZEN", False), value("RELEASE_BOARD_API_LEVEL", "202404"), - value("RELEASE_BUILD_FLAGS_IN_PROTOBUF", False), value("RELEASE_DEPRECATE_VNDK", True), value("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", "11"), value("RELEASE_PLATFORM_SDK_VERSION", "34"), diff --git a/build_config/ap2a=make b/build_config/ap2a=make deleted file mode 100644 index e69de29b..00000000 --- a/build_config/ap2a=make +++ /dev/null diff --git a/build_config/fail.scl b/build_config/fail.scl deleted file mode 100644 index 70f5954c..00000000 --- a/build_config/fail.scl +++ /dev/null @@ -1,24 +0,0 @@ -""" -Build flag values for release config next. -""" -# Copyright (C) 2024 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 -# - -fail("This release config now uses protobuf only: see go/android-build-flags") |