summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorLuis Hector Chavez <lhchavez@google.com>2017-07-26 17:33:47 +0000
committerLuis Hector Chavez <lhchavez@google.com>2017-07-26 17:33:47 +0000
commite5b2c6fa6f923f3a2f66346c2f169d9f0fceb3dc (patch)
tree26593cf846dcf61fbaa2d04558e4984333832351 /SConstruct
parent0601274935e7f632eb0d6ce0fd223b744349d20b (diff)
downloadlibchrome-e5b2c6fa6f923f3a2f66346c2f169d9f0fceb3dc.tar.gz
Revert "libchrome: Uprev the library to r456626 from Chromium"android-o-iot-preview-5o-iot-preview-5
This reverts commit 0601274935e7f632eb0d6ce0fd223b744349d20b. Reason for revert: Broke the mac_sdk Exempt-From-Owner-Approval: Fixing mac_sdk Change-Id: I2cab1818261f3b75dcf7dfc3edf6d6b7bab541a8
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct9
1 files changed, 5 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 49cef6f434..72e022e6cd 100644
--- a/SConstruct
+++ b/SConstruct
@@ -270,6 +270,7 @@ base_libs = [
'name' : 'crypto',
'sources' : """
hmac.cc
+ hmac_nss.cc
nss_key_util.cc
nss_util.cc
openssl_util.cc
@@ -282,9 +283,9 @@ base_libs = [
secure_hash.cc
secure_util.cc
sha2.cc
- signature_creator.cc
- signature_verifier.cc
- symmetric_key.cc
+ signature_creator_nss.cc
+ signature_verifier_nss.cc
+ symmetric_key_nss.cc
third_party/nss/rsawrapr.c
third_party/nss/sha512.cc
""",
@@ -308,7 +309,7 @@ base_libs = [
linux/seccomp-bpf/trap.cc
linux/seccomp-bpf-helpers/baseline_policy.cc
- linux/seccomp-bpf-helpers/sigsys_handlers.cc
+ linux/seccomp-bpf-helpers/sigsys_handlers.cc
linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
linux/seccomp-bpf-helpers/syscall_sets.cc