commit fa8f43b2fd4d831b1422b1ad3d10c54da941752a
author sbc <sbc@chromium.org> Wed Oct 05 17:11:35 2016
committer Commit bot <commit-bot@chromium.org> Wed Oct 05 17:13:26 2016
tree 3e78a68a59b77c6ddf079abfa273ef30fe5e4e6e
parent 65d34f88d15cc7e5481910a43e8f38ab3e97bd28

Allow linux installer to be build without chrome branding

This change allows chromium developers to build
installer packages by setting 'is_official_build'
without requiring 'is_chrome_branded'.

This allows the installer scripts to be developed
and tested without needing access to the closed source
chrome branding.

BUG=564904

Review-Url: https://codereview.chromium.org/2395673002
Cr-Commit-Position: refs/heads/master@{#423197}

chrome/installer/linux/BUILD.gn

diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn
index ae73272..d1c8114 100644
--- a/chrome/installer/linux/BUILD.gn
+++ b/chrome/installer/linux/BUILD.gn
@@ -13,7 +13,7 @@
   import("//media/cdm/ppapi/cdm_paths.gni")
 }
 
-assert(is_linux && is_chrome_branded)
+assert(is_linux)
 
 # This target builds all "normal" Linux installers.
 #
@@ -72,7 +72,6 @@
     "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",
@@ -84,6 +83,12 @@
     "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") {
@@ -224,20 +229,20 @@
   ]
 
   if (current_cpu == "x86") {
-    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",
-    ]
+    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",
-      "$root_out_dir/$widevine_cdm_path/libwidevinecdmadapter.so",
-      "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so",
-    ]
+    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/$widevine_cdm_path/libwidevinecdmadapter.so",
+      "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so",
+    ]
+  }
+
   if (is_asan) {
     packaging_files_binaries += [ "$root_out_dir/lib/libc++.so" ]
   }