diff options
| author | Adam Langley <agl@google.com> | 2015-04-01 11:29:03 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-04-02 00:54:07 +0000 |
| commit | 9978e0aa0069697816a38c7dcc6a81be5975cab7 (patch) | |
| tree | c0c10132781c0a7bce5a26b70eb28beea8e97c73 /Android.mk | |
| parent | b5a439241fee558631d466cfa5203dd447504427 (diff) | |
| download | vboot-9978e0aa0069697816a38c7dcc6a81be5975cab7.tar.gz | |
vboot: fix name-collision with OpenSSL.stabilize-6946.55.Bstabilize-6937.Brelease-R43-6946.B
vboot currently uses the |SHA256_CTX| name, which is claimed by OpenSSL.
To work around this, it defines OPENSSL_NO_SHA, but that can't be done
at compile time:
The OPENSSL_NO_* defines are set by OpenSSL to reflect the configuration
that it was built with so that users of OpenSSL can disable features as
needed. They can affect the contents of structures any thus the ABI of
the library.
If these defines are set outside of OpenSSL, then the library and the
code that uses it will have incompatible ABIs. At that point it's only
functioning by blind luck.
This change renames the name-collisions so that this hack isn't needed.
This is the same change as was made internally in cl/85758149.
BUG=none
BRANCH=none
TEST=emerge-samus coreboot; make runtests
Change-Id: I709da2507f341896d89d50129ce30ffb111a20d1
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/263506
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -24,8 +24,7 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/firmware/lib/tpm_lite/include \ $(LOCAL_PATH)/firmware/2lib/include \ $(LOCAL_PATH)/host/include \ - $(LOCAL_PATH)/host/lib/include \ - external/openssl/include + $(LOCAL_PATH)/host/lib/include # Firmware library sources needed by VbInit() call VBINIT_SRCS = \ @@ -108,6 +107,7 @@ LOCAL_SRC_FILES := \ $(UTILLIB_SRCS) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_C_INCLUDES) +LOCAL_STATIC_LIBRARIES := libcrypto_static include $(BUILD_HOST_STATIC_LIBRARY) @@ -174,6 +174,6 @@ $(generated_sources)/futility_cmds.c: ${FUTIL_SRCS:%=${LOCAL_PATH}/%} LOCAL_GENERATED_SOURCES := $(generated_sources)/futility_cmds.c LOCAL_STATIC_LIBRARIES := libvboot_util-host -LOCAL_SHARED_LIBRARIES := libssl-host libcrypto-host +LOCAL_SHARED_LIBRARIES := libcrypto-host include $(BUILD_HOST_EXECUTABLE) |