diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-30 20:21:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-30 20:21:03 +0000 |
| commit | 4b126c4604965ea029d9c741d074ad7f820b5269 (patch) | |
| tree | 99d521160252c0ebfffefb19f6eb5e8b5f3c9b31 /libutils/tests | |
| parent | 58f4a09bb4375c2f7b85ec14449a0588e85e126a (diff) | |
| parent | e8f90ca60d65f5a0542b77f8f517c4fb80da2e52 (diff) | |
| download | system_core-4b126c4604965ea029d9c741d074ad7f820b5269.zip system_core-4b126c4604965ea029d9c741d074ad7f820b5269.tar.gz system_core-4b126c4604965ea029d9c741d074ad7f820b5269.tar.bz2 | |
am e8f90ca6: am 570cd46d: Merge "Revert "Move libutils to libc++""
* commit 'e8f90ca60d65f5a0542b77f8f517c4fb80da2e52':
Revert "Move libutils to libc++"
Diffstat (limited to 'libutils/tests')
| -rw-r--r-- | libutils/tests/Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libutils/tests/Android.mk b/libutils/tests/Android.mk index da51a94..caedaff 100644 --- a/libutils/tests/Android.mk +++ b/libutils/tests/Android.mk @@ -18,6 +18,11 @@ shared_libraries := \ liblog \ libcutils \ libutils \ + libstlport + +static_libraries := \ + libgtest \ + libgtest_main $(foreach file,$(test_src_files), \ $(eval include $(CLEAR_VARS)) \ |