Allow linux installer to be build without chrome branding

chrome/installer/linux/BUILD.gn

 # Copyright 2015 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/features.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/util/process_version.gni")
 import("//build/util/version.gni")
 import("//chrome/process_version_rc_template.gni")  # For branding_file_path.
 
 if (current_cpu == "x86" || current_cpu == "x64") {
   import("//media/cdm/ppapi/cdm_paths.gni")
 }
 
-assert(is_linux && is_chrome_branded)
+assert(is_linux)
 
 # This target builds all "normal" Linux installers.
 #
 # The bot setup is to build stable, unstable, and beta packages for the current
 # build. Then a later step picks up the package corresponding to what the
 # current build is supposed to be. This is wasteful since one build will only
 # be one of these. This build file also has targets for trunk and possibly asan
 # installers.
 #
 # TODO it would be much nicer to have a build variable so the bot can tell us
@@ skipping 38 matching lines @@
 branding_dir_100 =
     "//chrome/app/theme/default_100_percent/$branding_path_component"
 
 copy("common_packaging_files") {
   visibility = [ ":*" ]
   sources = [
     "common/apt.include",
     "common/default-app-block.template",
     "common/default-app.template",
     "common/desktop.template",
-    "common/google-chrome/google-chrome.info",
     "common/installer.include",
     "common/postinst.include",
     "common/prerm.include",
     "common/repo.cron",
     "common/rpm.include",
     "common/rpmrepo.cron",
     "common/symlinks.include",
     "common/variables.include",
     "common/wrapper",
   ]
 
+  if (is_chrome_branded) {
+    sources += [ "common/google-chrome/google-chrome.info" ]
+  } else {
+    sources += [ "common/chromium-browser/chromium-browser.info" ]
+  }
+
   if (current_cpu == "x86") {
     sources += [ "//build/linux/bin/eu-strip" ]
   } else if (current_cpu == "x64") {
     sources += [ "/usr/bin/eu-strip" ]
   }
 
   outputs = [
     "$root_out_dir/installer/common/{{source_file_part}}",
   ]
 }
@@ skipping 120 matching lines @@
     "$root_out_dir/chrome_sandbox",
     "$root_out_dir/xdg-mime",
     "$root_out_dir/xdg-settings",
     "$root_out_dir/locales/en-US.pak",
 
     "$root_out_dir/nacl_helper",
     "$root_out_dir/nacl_helper_bootstrap",
   ]
 
   if (current_cpu == "x86") {
+    packaging_files_binaries += [ "$root_out_dir/nacl_irt_x86_32.nexe" ]
+  } else if (current_cpu == "x64") {
+    packaging_files_binaries += [ "$root_out_dir/nacl_irt_x86_64.nexe" ]
+  } else if (current_cpu == "arm") {
+    packaging_files_binaries += [ "$root_out_dir/nacl_irt_arm.nexe" ]
+  }
+
+  if (is_chrome_branded) {
     packaging_files_binaries += [
-      "$root_out_dir/nacl_irt_x86_32.nexe",
       "$root_out_dir/$widevine_cdm_path/libwidevinecdmadapter.so",
       "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so",
     ]
-  } else if (current_cpu == "x64") {
-    packaging_files_binaries += [
-      "$root_out_dir/nacl_irt_x86_64.nexe",
-      "$root_out_dir/$widevine_cdm_path/libwidevinecdmadapter.so",
-      "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so",
-    ]
-  } else if (current_cpu == "arm") {
-    packaging_files_binaries += [ "$root_out_dir/nacl_irt_arm.nexe" ]
   }
+
   if (is_asan) {
     packaging_files_binaries += [ "$root_out_dir/lib/libc++.so" ]
   }
 
   deb_target_name = "${target_name}_deb"
   action(deb_target_name) {
     visibility = [ ":*" ]
     script = "flock_make_package.py"
 
     if (current_cpu == "x86") {
@@ skipping 95 matching lines @@
 # Other packages that we support that aren't included in the default "linux"
 # target.
 linux_package("trunk") {
   channel = "trunk"
 }
 if (is_asan) {
   linux_package("asan") {
     channel = "asan"
   }
 }