chromium/src
0
Fork 0
Code Activity

Remove references to 'chrome_build_id'

Browse Source 
These were an artifact of meeting licensing requirements in order
to find build artifacts for a deployed chrome.
As of https://codereview.chromium.org/1948503002/ the
code will be entirely open-source so this is unnecessary.
BUG=607207

Review-Url: https://codereview.chromium.org/1940153003
Cr-Commit-Position: refs/heads/master@{#391535}
This commit is contained in:
yfriedman
2016-05-04 09:36:24 -07:00
committed by Commit bot
parent 9bc4200b07
commit 9b4327b53b
10 changed files with 2 additions and 31 deletions

6
build/common.gypi

@ -4727,11 +4727,6 @@
# Android-specific options; note that most are set above with Linux.
['OS=="android"', {
'variables': {
# This is a unique identifier for a given build. It's used for
# identifying various build artifacts corresponding to a particular
# build of chrome (e.g. where to find archived symbols).
'chrome_build_id%': '',
# Placing this variable here prevents from forking libvpx, used
# by remoting. Remoting is off, so it needn't built,
# so forking it's deps seems like overkill.
@ -4821,7 +4816,6 @@
'defines': [
'ANDROID',
'__GNU_SOURCE=1', # Necessary for clone()
'CHROME_BUILD_ID="<(chrome_build_id)"',
# The NDK has these things, but doesn't define the constants
# to say that it does. Define them here instead.
'HAVE_SYS_UIO_H',

5
build/config/android/config.gni

@ -73,11 +73,6 @@ if (is_android) {
# The password for the keystore to use for signing builds.
android_keystore_password = default_android_keystore_password
# This is a unique identifier for a given build. It's used for
# identifying various build artifacts corresponding to a particular build of
# chrome (e.g. where to find archived symbols).
android_chrome_build_id = "\"\""
# Set to true to run findbugs on JAR targets.
run_findbugs = false

2
chrome/browser/ui/BUILD.gn

@ -388,8 +388,6 @@ source_set("ui") {
if (is_android) {
deps += [ "//crypto:platform" ]
defines += [ "CHROME_BUILD_ID=\"$android_chrome_build_id\"" ]
if (android_java_ui) {
sources +=
rebase_path(gypi_values.chrome_browser_ui_android_java_ui_sources,

3
chrome/browser/ui/webui/version_ui.cc

@ -69,9 +69,6 @@ WebUIDataSource* CreateVersionUIDataSource() {
#if defined(OS_ANDROID)
html_source->AddString(version_ui::kOSVersion,
AndroidAboutAppInfo::GetOsInfo());
html_source->AddLocalizedString(version_ui::kBuildIDName,
IDS_VERSION_UI_BUILD_ID);
html_source->AddString(version_ui::kBuildID, CHROME_BUILD_ID);
#else
html_source->AddString(version_ui::kOSVersion, std::string());
html_source->AddString(version_ui::kFlashPlugin, "Flash");

4
components/crash/content/app/BUILD.gn

@ -128,10 +128,6 @@ source_set("app_non_mac_win") {
"//content/public/common:result_codes",
]
if (is_android) {
defines += [ "CHROME_BUILD_ID=\"$android_chrome_build_id\"" ]
}
# Clang's -mstackrealign doesn't work well with
# linux_syscall_support.h hand written asm syscalls.
# See https://crbug.com/556393

2
components/crash/content/app/breakpad_linux.cc

@ -603,8 +603,6 @@ bool FinalizeCrashDoneAndroid(bool is_browser_process) {
android_build_info->package_version_name());
__android_log_write(ANDROID_LOG_WARN, kGoogleBreakpad,
android_build_info->package_version_code());
__android_log_write(ANDROID_LOG_WARN, kGoogleBreakpad,
CHROME_BUILD_ID);
AndroidLogWriteHorizontalRule();
if (!is_browser_process &&

2
components/version_ui/version_ui_constants.cc

@ -20,8 +20,6 @@ const char kReturnVariationInfo[] = "returnVariationInfo";
const char kApplicationLabel[] = "application_label";
const char kARC[] = "arc_label";
const char kBlinkVersion[] = "blink_version";
const char kBuildID[] = "build_id";
const char kBuildIDName[] = "build_id_name";
const char kCL[] = "cl";
const char kCommandLine[] = "command_line";
const char kCommandLineName[] = "command_line_name";

2
components/version_ui/version_ui_constants.h

@ -24,8 +24,6 @@ extern const char kReturnVariationInfo[];
extern const char kApplicationLabel[];
extern const char kARC[];
extern const char kBlinkVersion[];
extern const char kBuildID[];
extern const char kBuildIDName[];
extern const char kCL[];
extern const char kCommandLine[];
extern const char kCommandLineName[];

5
components/version_ui_strings.grdp

@ -44,9 +44,4 @@
<message name="IDS_VERSION_UI_VARIATIONS" desc="label for the variations list on the about:version page">
Variations
</message>
<if expr="is_android">
<message name="IDS_VERSION_UI_BUILD_ID" desc="label for the build identifier on the about:version page">
Build ID
</message>
</if>
</grit-part>

2
docs/android_build_instructions.md

@ -341,6 +341,8 @@ out/Default/bin/install_chrome_public_apk_incremental -v --uninstall
#### Rebuilding libchrome.so for a particular release
These instructions are only necessary for Chrome 51 and earlier.
In the case where you want to modify the native code for an existing
release of Chrome for Android (v25+) you can do the following steps.
Note that in order to get your changes into the official release, you'll