Revert "Add Build flags for clang version"
Revert submission 33829033-clang-build-flags
Reason for revert: DroidMonitor: Potential culprit for http://b/422756397 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Bug: b/422756397
Reverted changes: /q/submissionid:33829033-clang-build-flags
Change-Id: Ie607f6c75304afbc7cab15c2234baba3c1428b39
diff --git a/OWNERS b/OWNERS
index 9022614..17d5e9a 100644
--- a/OWNERS
+++ b/OWNERS
@@ -33,8 +33,6 @@
per-file aconfig/*/*,aconfig/*/*/*=tejaswiy@google.com
per-file flag_values/*/RELEASE_BUILD_AFDO_PROFILE_VERSION.textproto = file:platform/prebuilts/clang/host/linux-x86:/OWNERS # Android LLVM Toolchain
-per-file flag_values/trunk*/RELEASE_BUILD_CLANG_SHORT_VERSION.textproto = file:platform/prebuilts/clang/host/linux-x86:/OWNERS # Android LLVM Toolchain
-per-file flag_values/trunk*/RELEASE_BUILD_CLANG_VERSION.textproto = file:platform/prebuilts/clang/host/linux-x86:/OWNERS # Android LLVM Toolchain
per-file {flag_declarations,flag_values/*}/RELEASE_PLATFORM_BASE_SDK_EXTENSION_VERSION.textproto = file:platform/frameworks/base:/SDK_OWNERS # Android SDK
per-file {flag_declarations,flag_values/*}/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto = file:platform/frameworks/base:/SDK_OWNERS # Android SDK
diff --git a/flag_declarations/RELEASE_BUILD_CLANG_SHORT_VERSION.textproto b/flag_declarations/RELEASE_BUILD_CLANG_SHORT_VERSION.textproto
deleted file mode 100644
index 7c43f86..0000000
--- a/flag_declarations/RELEASE_BUILD_CLANG_SHORT_VERSION.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-name: "RELEASE_BUILD_CLANG_SHORT_VERSION"
-namespace: "llvm_and_toolchains"
-description: "Control which version of Clang is used to build the platform"
-value: {
- string_value: ""
-}
-workflow: PREBUILT
-containers: "product"
-containers: "system"
-containers: "system_ext"
-containers: "vendor"
diff --git a/flag_declarations/RELEASE_BUILD_CLANG_VERSION.textproto b/flag_declarations/RELEASE_BUILD_CLANG_VERSION.textproto
deleted file mode 100644
index 823c631..0000000
--- a/flag_declarations/RELEASE_BUILD_CLANG_VERSION.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-name: "RELEASE_BUILD_CLANG_VERSION"
-namespace: "llvm_and_toolchains"
-description: "Control which version of Clang is used to build the platform"
-value: {
- string_value: ""
-}
-workflow: PREBUILT
-containers: "product"
-containers: "system"
-containers: "system_ext"
-containers: "vendor"
diff --git a/flag_values/trunk_staging/RELEASE_BUILD_CLANG_SHORT_VERSION.textproto b/flag_values/trunk_staging/RELEASE_BUILD_CLANG_SHORT_VERSION.textproto
deleted file mode 100644
index c6ca707..0000000
--- a/flag_values/trunk_staging/RELEASE_BUILD_CLANG_SHORT_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_BUILD_CLANG_SHORT_VERSION"
-value: {
- string_value: "20"
-}
diff --git a/flag_values/trunk_staging/RELEASE_BUILD_CLANG_VERSION.textproto b/flag_values/trunk_staging/RELEASE_BUILD_CLANG_VERSION.textproto
deleted file mode 100644
index 489f8b5..0000000
--- a/flag_values/trunk_staging/RELEASE_BUILD_CLANG_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_BUILD_CLANG_VERSION"
-value: {
- string_value: "clang-r547379"
-}
