| commit | 4c7d1a1623b341a5b8549fca4fa1646ff0c1ba97 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue Nov 04 16:07:13 2014 -0800 |
| committer | Dan Albert <danalbert@google.com> | Tue Nov 04 16:09:51 2014 -0800 |
| tree | 2adac388e549ef770d0ea2f96993a8fdbbddeaf3 | |
| parent | 789860d0e09a2d98976e028179afe0446f2172cc [diff] |
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
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_STATIC_LIBRARIES := \ libscrypt_static \ - libgtest \ - libgtest_main LOCAL_MODULE := scrypt_test