diff options
| -rw-r--r-- | ddms/libs/ddmlib/src/com/android/ddmlib/Log.java | 14 | ||||
| -rw-r--r-- | sdklauncher/Android.mk | 9 |
2 files changed, 19 insertions, 4 deletions
diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/Log.java b/ddms/libs/ddmlib/src/com/android/ddmlib/Log.java index ce95b04..e24c353 100644 --- a/ddms/libs/ddmlib/src/com/android/ddmlib/Log.java +++ b/ddms/libs/ddmlib/src/com/android/ddmlib/Log.java @@ -337,13 +337,21 @@ public final class Log { * @param message */ public static void printLog(LogLevel logLevel, String tag, String message) { + System.out.print(getLogFormatString(logLevel, tag, message)); + } + + /** + * Formats a log message. + * @param logLevel + * @param tag + * @param message + */ + public static String getLogFormatString(LogLevel logLevel, String tag, String message) { long msec; msec = System.currentTimeMillis(); - String outMessage = String.format("%02d:%02d %c/%s: %s\n", - (msec / 60000) % 60, (msec / 1000) % 60, + return String.format("%02d:%02d %c/%s: %s\n", (msec / 60000) % 60, (msec / 1000) % 60, logLevel.getPriorityLetter(), tag, message); - System.out.print(outMessage); } } diff --git a/sdklauncher/Android.mk b/sdklauncher/Android.mk index 3e92ea8..e3cc7d3 100644 --- a/sdklauncher/Android.mk +++ b/sdklauncher/Android.mk @@ -20,6 +20,13 @@ LOCAL_CFLAGS += -Wall -Wno-unused-parameter LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -DSH_HISTORY LOCAL_MODULE := sdklauncher +# Locate windres executable +WINDRES := windres +ifneq ($(USE_MINGW),) + # When building the Windows emulator under Linux, use the MinGW one + WINDRES := i586-mingw32msvc-windres +endif + # Link the Windows icon file as well into the executable, based on the technique # used in external/qemu/Makefile.android. # @@ -27,7 +34,7 @@ INTERMEDIATE := $(call intermediates-dir-for,EXECUTABLES,$(LOCAL_MODULE),tru ANDROID_ICON_OBJ := android_icon.o ANDROID_ICON_PATH := $(LOCAL_PATH)/images $(ANDROID_ICON_PATH)/$(ANDROID_ICON_OBJ): $(ANDROID_ICON_PATH)/android_icon.rc - windres $< -I $(ANDROID_ICON_PATH) -o $@ + $(WINDRES) $< -I $(ANDROID_ICON_PATH) -o $@ # seems to be the only way to add an object file that was not generated from # a C/C++/Java source file to our build system. and very unfortunately, |