commit | 917d6f4c73f7856adf4f369a675aeccfe42d746b | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Sun Nov 16 01:08:24 2014 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sun Nov 16 01:08:25 2014 +0000 |
tree | 84f2424c0f2c2759414c91c0bf739ecb1f8dbdfe | |
parent | 133b7d4a84e6fd257bc1365b623415d41d8ebe2f [diff] | |
parent | 890442a02d0cf517cae98ed9f8bd60b15d0b9950 [diff] |
Merge "Move libutils to libc++."
diff --git a/libutils/Android.mk b/libutils/Android.mk index 0376c8c..e738c15 100644 --- a/libutils/Android.mk +++ b/libutils/Android.mk
@@ -104,8 +104,6 @@ liblog \ libdl -include external/stlport/libstlport.mk - LOCAL_MODULE:= libutils include $(BUILD_STATIC_LIBRARY) @@ -121,8 +119,6 @@ liblog LOCAL_CFLAGS := -Werror -include external/stlport/libstlport.mk - include $(BUILD_SHARED_LIBRARY) # Include subdirectory makefiles