android envsetup: Stop setting branding=Chrome buildtype=Official.

build/android/envsetup_functions.sh

 #!/bin/bash
 
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Defines functions for envsetup.sh which sets up environment for building
 # Chromium on Android.  The build can be either use the Android NDK/SDK or
 # android source tree.  Each has a unique init function which calls functions
 # prefixed with "common_" that is common for both environment setups.
@@ skipping 11 matching lines @@
 
   # Add Chromium Android development scripts to system path.
   # Must be after CHROME_SRC is set.
   export PATH=$PATH:${CHROME_SRC}/build/android
 
   # The set of GYP_DEFINES to pass to gyp.
   DEFINES="OS=android"
   DEFINES+=" host_os=${host_os}"
 
   if [[ -n "$CHROME_ANDROID_OFFICIAL_BUILD" ]]; then
-    DEFINES+=" branding=Chrome"
-    DEFINES+=" buildtype=Official"
-
     # These defines are used by various chrome build scripts to tag the binary's
     # version string as 'official' in linux builds (e.g. in
     # chrome/trunk/src/chrome/tools/build/version.py).
     export OFFICIAL_BUILD=1
     export CHROMIUM_BUILD="_google_chrome"
     export CHROME_BUILD_TYPE="_official"
   fi
 
   # TODO(thakis), Jan 18 2014: Remove this after two weeks or so, after telling
   # everyone to set use_goma in GYP_DEFINES instead of a GOMA_DIR env var.
@@ skipping 147 matching lines @@
   DEFINES+=" android_sdk_root=\$(PWD)/${ANDROID_SDK}"
   DEFINES+=" android_sdk_tools=\$(PWD)/${ANDROID_SDK_TOOLS}"
   DEFINES+=" android_sdk_version=${ANDROID_SDK_VERSION}"
   DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}"
   if [[ -n "$CHROME_ANDROID_WEBVIEW_OFFICIAL_BUILD" ]]; then
     DEFINES+=" logging_like_official_build=1"
     DEFINES+=" tracing_like_official_build=1"
   fi
   export GYP_DEFINES="${DEFINES}"
 }