diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-12 16:22:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-12 16:22:03 +0000 |
| commit | 4355c0c98644c37f0511257403bbfb71b342e2df (patch) | |
| tree | 6a114c465b05b6e65f1ef7d8325dac1ee7e614f8 /opengl/libs | |
| parent | 9e8b528926506b3fa9ca7df52fef5f56ec6149c7 (diff) | |
| parent | e1e3d278549eb6389eb0b5fa3f13a4ac079a55a2 (diff) | |
| download | frameworks_native-4355c0c98644c37f0511257403bbfb71b342e2df.zip frameworks_native-4355c0c98644c37f0511257403bbfb71b342e2df.tar.gz frameworks_native-4355c0c98644c37f0511257403bbfb71b342e2df.tar.bz2 | |
am e1e3d278: Merge "Clean cruft out of makefiles."
* commit 'e1e3d278549eb6389eb0b5fa3f13a4ac079a55a2':
Clean cruft out of makefiles.
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) |