diff options
author | Kenny Root <kroot@google.com> | 2015-10-02 16:09:15 -0700 |
---|---|---|
committer | Kenny Root <kroot@google.com> | 2015-10-02 16:09:49 -0700 |
commit | fe7305364c3369f9222a61646c5c9842eae9bceb (patch) | |
tree | 360ada970b7bb1046ae069d253ba24d9622eb3ad /src/crypto/CMakeLists.txt | |
parent | 691ef9d0ff0ece39ffd6a58960a7cd195ef584ae (diff) | |
parent | b452bce3bf2034466cee6206ebf3994409468ee4 (diff) | |
download | external_boringssl-fe7305364c3369f9222a61646c5c9842eae9bceb.zip external_boringssl-fe7305364c3369f9222a61646c5c9842eae9bceb.tar.gz external_boringssl-fe7305364c3369f9222a61646c5c9842eae9bceb.tar.bz2 |
Merge mnc-dr-dev-plus-aosp into mnc-ub-dev
This pulls in the latest version of BoringSSL.
Change-Id: I0ab5c73d60f41a696c9a828fac87670aaca10dec
Diffstat (limited to 'src/crypto/CMakeLists.txt')
-rw-r--r-- | src/crypto/CMakeLists.txt | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt index 6858cbb..3115279 100644 --- a/src/crypto/CMakeLists.txt +++ b/src/crypto/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. ../include) +include_directories(../include) if(APPLE) if (${ARCH} STREQUAL "x86") @@ -57,7 +57,6 @@ if (${ARCH} STREQUAL "x86_64") set( CRYPTO_ARCH_SOURCES - cpu-x86_64-asm.${ASM_EXT} cpu-intel.c ) endif() @@ -66,7 +65,6 @@ if (${ARCH} STREQUAL "x86") set( CRYPTO_ARCH_SOURCES - cpu-x86-asm.${ASM_EXT} cpu-intel.c ) endif() @@ -230,6 +228,3 @@ add_executable( ) target_link_libraries(refcount_test crypto) - -perlasm(cpu-x86_64-asm.${ASM_EXT} cpu-x86_64-asm.pl) -perlasm(cpu-x86-asm.${ASM_EXT} cpu-x86-asm.pl) |