Commit 31c9172c authored by Rakina Zata Amni's avatar Rakina Zata Amni Committed by Commit Bot

Revert "Public side of Windows fix"

This reverts commit 87f410b6.

Reason for revert: Causes compile failures on windows

Original change's description:
> Public side of Windows fix
> 
> BUG=1099250
> 
> Change-Id: Ia73ff41012a1e4d9a7a524339ea30e0c327f1fe4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2269510
> Commit-Queue: Becca Hughes <beccahughes@chromium.org>
> Reviewed-by: Tommy Steimel <steimel@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#784168}

TBR=beccahughes@chromium.org,steimel@chromium.org

Change-Id: I4cc36628a32ecc17062e912264a0385db5108ffd
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1099250, 1101155
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2275160Reviewed-by: default avatarRakina Zata Amni <rakina@chromium.org>
Commit-Queue: Rakina Zata Amni <rakina@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784269}
parent bc1472e5
...@@ -6,8 +6,9 @@ import("//build/config/chrome_build.gni") ...@@ -6,8 +6,9 @@ import("//build/config/chrome_build.gni")
declare_args() { declare_args() {
# Enable Kaleidoscope if we are not Android and we have access to the internal # Enable Kaleidoscope if we are not Android and we have access to the internal
# code. # code. For now we are disabled on Windows and Chrome OS until the build issues
enable_kaleidoscope = !is_android && is_chrome_branded # are fixed.
enable_kaleidoscope = !is_android && !is_win && !is_chromeos && is_chrome_branded
tpm_fallback = false tpm_fallback = false
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment