diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-30 18:40:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-30 18:40:25 +0000 |
| commit | 36f536fc7b88fe21a974bce6fed565bc622b5bc2 (patch) | |
| tree | 244113ff3609db4399bbb5d8cfa9e22a912d3aa1 /libutils | |
| parent | 265262a8b243faa16c268ac40801a226359437a6 (diff) | |
| parent | 9f69e028f73ce3e3ebbbc795d9a0b1143acb15e6 (diff) | |
| download | core-36f536fc7b88fe21a974bce6fed565bc622b5bc2.tar.gz core-36f536fc7b88fe21a974bce6fed565bc622b5bc2.tar.bz2 core-36f536fc7b88fe21a974bce6fed565bc622b5bc2.zip | |
am 9f69e028: Merge "Move libutils to libc++"
* commit '9f69e028f73ce3e3ebbbc795d9a0b1143acb15e6':
Move libutils to libc++
Diffstat (limited to 'libutils')
| -rw-r--r-- | libutils/Android.mk | 8 | ||||
| -rw-r--r-- | libutils/tests/Android.mk | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/libutils/Android.mk b/libutils/Android.mk index 1c4861902..923d6906a 100644 --- a/libutils/Android.mk +++ b/libutils/Android.mk @@ -108,11 +108,11 @@ LOCAL_STATIC_LIBRARIES := \ libcutils LOCAL_SHARED_LIBRARIES := \ - libbacktrace \ + libbacktrace_libc++ \ liblog \ libdl -include external/stlport/libstlport.mk +include external/libcxx/libcxx.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 \ + libbacktrace_libc++ \ libcutils \ libdl \ liblog \ -include external/stlport/libstlport.mk +include external/libcxx/libcxx.mk include $(BUILD_SHARED_LIBRARY) diff --git a/libutils/tests/Android.mk b/libutils/tests/Android.mk index caedaffc0..da51a9498 100644 --- a/libutils/tests/Android.mk +++ b/libutils/tests/Android.mk @@ -18,11 +18,6 @@ shared_libraries := \ liblog \ libcutils \ libutils \ - libstlport - -static_libraries := \ - libgtest \ - libgtest_main $(foreach file,$(test_src_files), \ $(eval include $(CLEAR_VARS)) \ |