diff options
author | Dan Albert <danalbert@google.com> | 2014-11-04 16:07:13 -0800 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2014-11-04 16:09:51 -0800 |
commit | 4c7d1a1623b341a5b8549fca4fa1646ff0c1ba97 (patch) | |
tree | 2adac388e549ef770d0ea2f96993a8fdbbddeaf3 | |
parent | 789860d0e09a2d98976e028179afe0446f2172cc (diff) | |
download | scrypt-4c7d1a1623b341a5b8549fca4fa1646ff0c1ba97.tar.gz |
Don't explicitly link gtest.
The build system does this for us. Since libgtest is the stlport
version of the library, this causes build breakages when libc++ is the
default STL.
Bug: 15193147
Change-Id: Ief6f539de36f38d38bd1460b17efcdc09114d64d
-rw-r--r-- | tests/Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index c9e1d26..45987f3 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -19,8 +19,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \ libscrypt_static \ - libgtest \ - libgtest_main LOCAL_MODULE := scrypt_test |