diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-30 20:17:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-30 20:17:32 +0000 |
| commit | e8f90ca60d65f5a0542b77f8f517c4fb80da2e52 (patch) | |
| tree | b8d170d3028bddddf5c3f591e4542103376539ea | |
| parent | 36f536fc7b88fe21a974bce6fed565bc622b5bc2 (diff) | |
| parent | 570cd46d14645f622e9972671308fdb4f2425292 (diff) | |
| download | system_core-e8f90ca60d65f5a0542b77f8f517c4fb80da2e52.zip system_core-e8f90ca60d65f5a0542b77f8f517c4fb80da2e52.tar.gz system_core-e8f90ca60d65f5a0542b77f8f517c4fb80da2e52.tar.bz2 | |
am 570cd46d: Merge "Revert "Move libutils to libc++""
* commit '570cd46d14645f622e9972671308fdb4f2425292':
Revert "Move libutils to libc++"
| -rw-r--r-- | libutils/Android.mk | 8 | ||||
| -rw-r--r-- | libutils/tests/Android.mk | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/libutils/Android.mk b/libutils/Android.mk index 923d690..1c48619 100644 --- a/libutils/Android.mk +++ b/libutils/Android.mk @@ -108,11 +108,11 @@ LOCAL_STATIC_LIBRARIES := \ libcutils LOCAL_SHARED_LIBRARIES := \ - libbacktrace_libc++ \ + libbacktrace \ liblog \ libdl -include external/libcxx/libcxx.mk +include external/stlport/libstlport.mk LOCAL_MODULE:= libutils include $(BUILD_STATIC_LIBRARY) @@ -123,12 +123,12 @@ include $(CLEAR_VARS) LOCAL_MODULE:= libutils LOCAL_WHOLE_STATIC_LIBRARIES := libutils LOCAL_SHARED_LIBRARIES := \ - libbacktrace_libc++ \ + libbacktrace \ libcutils \ libdl \ liblog \ -include external/libcxx/libcxx.mk +include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) 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)) \ |