LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Clean up etc1tool."

Browse Source 
am: 12b751f1f8

* commit '12b751f1f8efdadf50731dd1ef6af6ac99d061cc':
  Clean up etc1tool.
This commit is contained in:
Elliott Hughes
2016-01-05 18:02:34 +00:00
committed by android-build-merger
parent 1eaf6797d0 12b751f1f8
commit 845662e75f
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/etc1tool/Android.mk
View File

@@ -9,12 +9,6 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := etc1tool.cpp LOCAL_SRC_FILES := etc1tool.cpp
LOCAL_C_INCLUDES += external/libpng
LOCAL_C_INCLUDES += external/zlib
LOCAL_C_INCLUDES += build/libs/host/include
LOCAL_C_INCLUDES += frameworks/base/opengl/include
#LOCAL_WHOLE_STATIC_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libhost \ libhost \
libexpat \ libexpat \

6
tools/etc1tool/etc1tool.cpp
View File

@@ -28,7 +28,7 @@ int writePNGFile(const char* pOutput, png_uint_32 width, png_uint_32 height,
const char* gpExeName; const char* gpExeName;
static static
void usage(char* message, ...) { void usage(const char* message, ...) {
if (message) { if (message) {
va_list ap; va_list ap;
va_start(ap, message); va_start(ap, message);
@@ -97,11 +97,11 @@ int changeExtension(char* pPath, size_t pathCapacity, const char* pExtension) {
return 0; return 0;
} }
void PNGAPI user_error_fn(png_structp png_ptr, png_const_charp message) { void PNGAPI user_error_fn(png_structp /*png_ptr*/, png_const_charp message) {
fprintf(stderr, "PNG error: %s\n", message); fprintf(stderr, "PNG error: %s\n", message);
} }
void PNGAPI user_warning_fn(png_structp png_ptr, png_const_charp message) { void PNGAPI user_warning_fn(png_structp /*png_ptr*/, png_const_charp message) {
fprintf(stderr, "PNG warning: %s\n", message); fprintf(stderr, "PNG warning: %s\n", message);
} }