diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-12 09:42:15 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-12 10:36:26 -0700 |
| commit | fbb8db2e2a885073812ca3975f68a90f9a837391 (patch) | |
| tree | 49dc7442fcd63de8435ddc0b146a83f94fba2770 /liblog | |
| parent | 91baad56f39fb77a4d07a0930c8743ebc61d7c0a (diff) | |
| download | system_core-fbb8db2e2a885073812ca3975f68a90f9a837391.zip system_core-fbb8db2e2a885073812ca3975f68a90f9a837391.tar.gz system_core-fbb8db2e2a885073812ca3975f68a90f9a837391.tar.bz2 | |
Remove makefile cruft.
Don't manually include stlport, and don't use private bionic headers.
Change-Id: I0fc4e8b34ab449e9ef07c26f71e472fca5640590
Diffstat (limited to 'liblog')
| -rw-r--r-- | liblog/tests/Android.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/liblog/tests/Android.mk b/liblog/tests/Android.mk index 6c72138..7728808 100644 --- a/liblog/tests/Android.mk +++ b/liblog/tests/Android.mk @@ -43,11 +43,8 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS += $(benchmark_c_flags) LOCAL_SHARED_LIBRARIES += liblog libm LOCAL_SRC_FILES := $(benchmark_src_files) -ifndef LOCAL_SDK_VERSION -LOCAL_C_INCLUDES += bionic bionic/libstdc++/include external/stlport/stlport -LOCAL_SHARED_LIBRARIES += libstlport -endif LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) +include external/stlport/libstlport.mk include $(BUILD_EXECUTABLE) # ----------------------------------------------------------------------------- |