summaryrefslogtreecommitdiff
path: root/utility
diff options
context:
space:
mode:
authorBill Richardson <wfrichar@chromium.org>2014-06-20 14:33:00 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-07-09 01:30:48 +0000
commit782990277ac7d6730db4c43c2b5632de93396921 (patch)
treea7c6c3d332e4e89d4ccdbb6ced0b269dda13022d /utility
parentf8f807a5ef00e8d5360fc2c9093bd0b5da8c0507 (diff)
downloadvboot-782990277ac7d6730db4c43c2b5632de93396921.tar.gz
Split libvboot_host.a into external and local libraries.
We've been creating and linking against a library called "libvboot_host.a" for two different reasons. The main purpose is to build the vboot_reference tools found in the utility/ directory. But there are some external userspace programs that would also like to use some functions in this library. This change establishes libvboot_host.a as the library for use by external userspace programs only, and creates a new libvboot_util.a library that's only used inside this source tree to build the vboot utilities. BUG=chromium:231567 BRANCH=ToT TEST=manual Build and run the local tests: make runalltests make clean Build Link firmware and all the utilities: emerge-link chromeos-base/vboot_reference \ sys-boot/depthcharge \ sys-boot/coreboot \ chromeos-base/chromeos-ec \ chromeos-base/chromeos-firmware-link \ chromeos-base/chromeos-cryptohome \ chromeos-base/update_engine \ chromeos-base/chromeos-installer \ chromeos-base/chromeos-login \ chromeos-base/verity Build Lumpy utilities, which include the 32-bit cros_installer: emerge-lumpy chromeos-base/vboot_reference \ chromeos-base/chromeos-login \ chromeos-base/verity \ chromeos-base/update_engine \ chromeos-base/chromeos-installer \ chromeos-base/chromeos-cryptohome Change-Id: Ie81ff1f74a6356cb8fab7d98471139d7758c4f19 Signed-off-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/207016 Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'utility')
-rw-r--r--utility/vbutil_firmware.c1
-rw-r--r--utility/vbutil_kernel.c1
-rw-r--r--utility/vbutil_key.c1
-rw-r--r--utility/vbutil_keyblock.c1
4 files changed, 4 insertions, 0 deletions
diff --git a/utility/vbutil_firmware.c b/utility/vbutil_firmware.c
index f6a547d6..f11d7b54 100644
--- a/utility/vbutil_firmware.c
+++ b/utility/vbutil_firmware.c
@@ -15,6 +15,7 @@
#include "cryptolib.h"
#include "host_common.h"
#include "kernel_blob.h"
+#include "util_misc.h"
#include "vboot_common.h"
diff --git a/utility/vbutil_kernel.c b/utility/vbutil_kernel.c
index 24a2ba6c..5fed77ac 100644
--- a/utility/vbutil_kernel.c
+++ b/utility/vbutil_kernel.c
@@ -23,6 +23,7 @@
#include "cryptolib.h"
#include "host_common.h"
#include "kernel_blob.h"
+#include "util_misc.h"
#include "vboot_common.h"
/* Global opts */
diff --git a/utility/vbutil_key.c b/utility/vbutil_key.c
index 18e37a22..3d9dfc4a 100644
--- a/utility/vbutil_key.c
+++ b/utility/vbutil_key.c
@@ -14,6 +14,7 @@
#include "cryptolib.h"
#include "host_common.h"
+#include "util_misc.h"
#include "vboot_common.h"
diff --git a/utility/vbutil_keyblock.c b/utility/vbutil_keyblock.c
index a26d7a99..17614580 100644
--- a/utility/vbutil_keyblock.c
+++ b/utility/vbutil_keyblock.c
@@ -13,6 +13,7 @@
#include "cryptolib.h"
#include "host_common.h"
+#include "util_misc.h"
#include "vboot_common.h"