commit 92a158a6038011658e360a2e25844eb9ebc2099d
author Michael Ryleev <gmar@google.com> Wed May 10 20:11:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 10 20:11:12 2017 +0000
tree ec2bb348f640df581c9604dd89d95832f2fce70f
parent 16a5f25f0f6cc489a75cbdd5305592bee96aebd0
parent a42478cf3ea077da6d53bde3ced09fd419a50de4

Merge "trusty: fixup trusty build"
am: a42478cf3e

Change-Id: I057cf9914787c5022f937a6cc955fdaa8cb83f79

rules.mk

diff --git a/rules.mk b/rules.mk
index 1a388c4..fb9dfcf 100644
--- a/rules.mk
+++ b/rules.mk
@@ -49,8 +49,6 @@
 LOCAL_SRC_FILES := $(filter-out src/crypto/bio/file.c,$(LOCAL_SRC_FILES))
 LOCAL_SRC_FILES := $(filter-out src/crypto/bio/socket.c,$(LOCAL_SRC_FILES))
 LOCAL_SRC_FILES := $(filter-out src/crypto/bio/socket_helper.c,$(LOCAL_SRC_FILES))
-LOCAL_SRC_FILES := $(filter-out src/crypto/directory_posix.c,$(LOCAL_SRC_FILES))
-LOCAL_SRC_FILES := $(filter-out src/crypto/rand/urandom.c,$(LOCAL_SRC_FILES))
 LOCAL_SRC_FILES := $(filter-out src/crypto/asn1/time_support.c,$(LOCAL_SRC_FILES))
 LOCAL_SRC_FILES := $(filter-out src/crypto/x509/by_dir.c,$(LOCAL_SRC_FILES))
 

src/crypto/fipsmodule/rand/urandom.c

diff --git a/src/crypto/fipsmodule/rand/urandom.c b/src/crypto/fipsmodule/rand/urandom.c
index 7f76145..202f2a4 100644
--- a/src/crypto/fipsmodule/rand/urandom.c
+++ b/src/crypto/fipsmodule/rand/urandom.c
@@ -15,7 +15,7 @@
 #include <openssl/rand.h>
 
 #if !defined(OPENSSL_WINDOWS) && !defined(OPENSSL_FUCHSIA) && \
-    !defined(BORINGSSL_UNSAFE_DETERMINISTIC_MODE)
+    !defined(BORINGSSL_UNSAFE_DETERMINISTIC_MODE) && !defined(OPENSSL_TRUSTY)
 
 #include <assert.h>
 #include <errno.h>
@@ -291,4 +291,4 @@
 }
 
 #endif /* !OPENSSL_WINDOWS && !defined(OPENSSL_FUCHSIA) && \
-          !BORINGSSL_UNSAFE_DETERMINISTIC_MODE */
+          !BORINGSSL_UNSAFE_DETERMINISTIC_MODE && !OPENSSL_TRUSTY */