Commit cbb31e64 authored by sebmarchand's avatar sebmarchand Committed by Commit bot

Add a PGO tag for the PGO builds in chrome://version

Also remove the VS2013 version string as we don't support it anymore.

BUG=309849

Review-Url: https://codereview.chromium.org/2157563002
Cr-Commit-Position: refs/heads/master@{#406119}
parent 88c37583
...@@ -136,9 +136,11 @@ WebUIDataSource* CreateVersionUIDataSource() { ...@@ -136,9 +136,11 @@ WebUIDataSource* CreateVersionUIDataSource() {
#if defined(__clang__) #if defined(__clang__)
html_source->AddString("compiler", "clang"); html_source->AddString("compiler", "clang");
#elif defined(_MSC_VER) && _MSC_VER == 1900 #elif defined(_MSC_VER) && _MSC_VER == 1900
#if BUILDFLAG(PGO_BUILD)
html_source->AddString("compiler", "MSVC 2015 (PGO)");
#else
html_source->AddString("compiler", "MSVC 2015"); html_source->AddString("compiler", "MSVC 2015");
#elif defined(_MSC_VER) && _MSC_VER == 1800 #endif
html_source->AddString("compiler", "MSVC 2013");
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#error "Unsupported version of MSVC." #error "Unsupported version of MSVC."
#else #else
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
'ANDROID_JAVA_UI=<(android_java_ui)', 'ANDROID_JAVA_UI=<(android_java_ui)',
'USE_VULCANIZE=<(use_vulcanize)', 'USE_VULCANIZE=<(use_vulcanize)',
'ENABLE_PACKAGE_MASH_SERVICES=<(enable_package_mash_services)', 'ENABLE_PACKAGE_MASH_SERVICES=<(enable_package_mash_services)',
'PGO_BUILD=<(pgo_build)',
], ],
}, },
}, },
......
...@@ -21,6 +21,11 @@ ...@@ -21,6 +21,11 @@
}, { }, {
'enable_background%': 1, 'enable_background%': 1,
'enable_google_now%': 1, 'enable_google_now%': 1,
}],
['chrome_pgo_phase!=0', {
'pgo_build%': 1,
}, {
'pgo_build%': 0,
}] }]
], ],
...@@ -35,6 +40,7 @@ ...@@ -35,6 +40,7 @@
'enable_google_now%': '<(enable_google_now)', 'enable_google_now%': '<(enable_google_now)',
'android_java_ui%': '<(android_java_ui)', 'android_java_ui%': '<(android_java_ui)',
'use_vulcanize%': '<(use_vulcanize)', 'use_vulcanize%': '<(use_vulcanize)',
'pgo_build%': '<(pgo_build)',
# GN only, but defined here so BUILDFLAG works without ifdef. # GN only, but defined here so BUILDFLAG works without ifdef.
'enable_package_mash_services%': 0, 'enable_package_mash_services%': 0,
......
...@@ -47,6 +47,7 @@ buildflag_header("features") { ...@@ -47,6 +47,7 @@ buildflag_header("features") {
"ENABLE_ONE_CLICK_SIGNIN=$enable_one_click_signin", "ENABLE_ONE_CLICK_SIGNIN=$enable_one_click_signin",
"ENABLE_PACKAGE_MASH_SERVICES=$enable_package_mash_services", "ENABLE_PACKAGE_MASH_SERVICES=$enable_package_mash_services",
"USE_VULCANIZE=$use_vulcanize", "USE_VULCANIZE=$use_vulcanize",
"PGO_BUILD=$pgo_build",
] ]
} }
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
# Please keep in sync! # Please keep in sync!
import("//build/config/chromecast_build.gni") import("//build/config/chromecast_build.gni")
import("//build/config/compiler/compiler.gni")
declare_args() { declare_args() {
enable_google_now = !is_ios && !is_android && !is_chromecast enable_google_now = !is_ios && !is_android && !is_chromecast
...@@ -29,6 +30,9 @@ declare_args() { ...@@ -29,6 +30,9 @@ declare_args() {
# Set to true to bundle all the mash related mojo services into chrome. # Set to true to bundle all the mash related mojo services into chrome.
# Specify --mash to chrome to have chrome start the mash environment. # Specify --mash to chrome to have chrome start the mash environment.
enable_package_mash_services = is_chromeos enable_package_mash_services = is_chromeos
# Indicates if the build is using PGO.
pgo_build = chrome_pgo_phase > 0
} }
chrome_grit_defines = [ chrome_grit_defines = [
......
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