diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-11 18:45:33 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-11 18:49:47 -0700 |
| commit | b79dfe672138805b4f70183fd738d9af58591148 (patch) | |
| tree | 725fb82c100c3296bd5b45ff0fc7a1e24f5a38ba /opengl/libs | |
| parent | 07c9557f603d405cbcb52434aca6f5ffdcc45072 (diff) | |
| download | frameworks_native-b79dfe672138805b4f70183fd738d9af58591148.zip frameworks_native-b79dfe672138805b4f70183fd738d9af58591148.tar.gz frameworks_native-b79dfe672138805b4f70183fd738d9af58591148.tar.bz2 | |
Clean cruft out of makefiles.
Cleans up manual uses of stlport and bionic (and removes uses of private
bionic headers).
Change-Id: I157309d702e59152adfa3450939082248ae4c043
Diffstat (limited to 'opengl/libs')
| -rw-r--r-- | opengl/libs/GLES_trace/Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/opengl/libs/GLES_trace/Android.mk b/opengl/libs/GLES_trace/Android.mk index 846932d..d74f77a 100644 --- a/opengl/libs/GLES_trace/Android.mk +++ b/opengl/libs/GLES_trace/Android.mk @@ -1,6 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_SRC_FILES := \ src/gltrace_api.cpp \ @@ -15,14 +16,12 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/../ \ - external/stlport/stlport \ external/protobuf/src \ external \ - bionic LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI LOCAL_STATIC_LIBRARIES := libprotobuf-cpp-2.3.0-lite liblzf -LOCAL_SHARED_LIBRARIES := libcutils libutils liblog libstlport +LOCAL_SHARED_LIBRARIES := libcutils libutils liblog LOCAL_CFLAGS += -DLOG_TAG=\"libGLES_trace\" @@ -32,4 +31,5 @@ LOCAL_C_INCLUDES += bionic/libc/private LOCAL_MODULE:= libGLES_trace LOCAL_MODULE_TAGS := optional +include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) |