diff options
author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:16 -0700 |
---|---|---|
committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:16 -0700 |
commit | bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e (patch) | |
tree | b17fbae7a6ff475ab37be48046d0540d594f84fb /core/jni/Android.mk | |
parent | 3f9dd287b99340efaaa257759e71a8f81b2ed113 (diff) | |
download | frameworks_base-bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e.zip frameworks_base-bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e.tar.gz frameworks_base-bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e.tar.bz2 |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
Diffstat (limited to 'core/jni/Android.mk')
-rw-r--r-- | core/jni/Android.mk | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 63fa504..58e7c8d 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -224,22 +224,14 @@ LOCAL_CFLAGS += -DHAVE_BLUETOOTH LOCAL_SHARED_LIBRARIES += libbluedroid libdbus endif -ifneq ($(TARGET_SIMULATOR),true) LOCAL_SHARED_LIBRARIES += \ libdl - # we need to access the private Bionic header - # <bionic_tls.h> in com_google_android_gles_jni_GLImpl.cpp - LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private -endif +# we need to access the private Bionic header +# <bionic_tls.h> in com_google_android_gles_jni_GLImpl.cpp +LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private LOCAL_LDLIBS += -lpthread -ldl -ifeq ($(TARGET_SIMULATOR),true) -ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86) -LOCAL_LDLIBS += -lrt -endif -endif - ifeq ($(WITH_MALLOC_LEAK_CHECK),true) LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK endif |