diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-30 18:32:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-30 18:32:08 +0000 |
| commit | 9f69e028f73ce3e3ebbbc795d9a0b1143acb15e6 (patch) | |
| tree | b07b25b1d5e782e2daf7b3a630af90a24692e935 | |
| parent | 5f815da3aba73e7605b72b6b3e2de648ca7c3390 (diff) | |
| parent | dc133729b0bc983c6ecfecdb06ac8b433ea31350 (diff) | |
| download | system_core-9f69e028f73ce3e3ebbbc795d9a0b1143acb15e6.zip system_core-9f69e028f73ce3e3ebbbc795d9a0b1143acb15e6.tar.gz system_core-9f69e028f73ce3e3ebbbc795d9a0b1143acb15e6.tar.bz2 | |
Merge "Move libutils to libc++"
| -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 1c48619..923d690 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 caedaff..da51a94 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)) \ |