commit | 7810449ca1c0bbb7429188df96eab2dca8fbddca | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 17 18:05:43 2008 -0800 |
committer | Alex Ray <aray@google.com> | Tue Jul 30 13:56:49 2013 -0700 |
tree | 6fac5cea20d1456b513ce3504b96d6e1fcaadad1 | |
parent | d245d1d09731d6a19e8a25559d3907f54441ac3d [diff] [blame] |
Code drop from //branches/cupcake/...@124589
diff --git a/libs/utils/Android.mk b/libs/utils/Android.mk index 4a68dc1..cdb8ca2 100644 --- a/libs/utils/Android.mk +++ b/libs/utils/Android.mk
@@ -139,6 +139,14 @@ liblog \ libcutils +ifneq ($(TARGET_SIMULATOR),true) +ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86) +# This is needed on x86 to bring in dl_iterate_phdr for CallStack.cpp +LOCAL_SHARED_LIBRARIES += \ + libdl +endif # linux-x86 +endif # sim + LOCAL_MODULE:= libutils #LOCAL_CFLAGS+=