commit 3e6ead984905c08f2bc16ad4bc17a49b4ec261b3
author Jon Salz <jsalz@chromium.org> Fri Oct 12 13:18:28 2012 +0800
committer Jon Salz <jsalz@chromium.org> Thu Oct 11 22:20:36 2012 -0700
tree cd387f0cf636509672ddc1d575054cad9c7fc24e
parent e824585f80cd98e6695921feb2a891a6eb84809b

factory-3004.B: Do not include OEM partition in any images on factory branch.

BUG=chrome-os-partner:14652
TEST=Built factory image

Change-Id: I6bafb525e38214fef6bf966cfb9bd9b801d66fe9
Reviewed-on: https://gerrit.chromium.org/gerrit/35398
Reviewed-by: Jon Salz <jsalz@chromium.org>
Tested-by: Jon Salz <jsalz@chromium.org>

common.sh

diff --git a/common.sh b/common.sh
index 1686006..822c0ef 100644
--- a/common.sh
+++ b/common.sh
@@ -366,6 +366,12 @@
   /lib/modules/*/source
   "
 
+# Hack for factory-3004.B (see crosbug.com/p/14652)
+DEFAULT_INSTALL_MASK="
+  $DEFAULT_INSTALL_MASK
+  /usr/share/oem
+  "
+
 # Mask for factory test image (build_image --factory)
 FACTORY_TEST_INSTALL_MASK="
   $COMMON_INSTALL_MASK