diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/StringPool.cpp | 8 | ||||
| -rw-r--r-- | tools/preload2/Android.mk | 10 | ||||
| -rw-r--r-- | tools/preload2/src/com/android/preload/DeviceUtils.java | 4 |
3 files changed, 9 insertions, 13 deletions
diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp index 9908c44c6d1f..37a493329ade 100644 --- a/tools/aapt/StringPool.cpp +++ b/tools/aapt/StringPool.cpp @@ -390,12 +390,12 @@ sp<AaptFile> StringPool::createStringBlock() #define ENCODE_LENGTH(str, chrsz, strSize) \ { \ - size_t maxMask = 1 << ((chrsz*8)-1); \ + size_t maxMask = 1 << (((chrsz)*8)-1); \ size_t maxSize = maxMask-1; \ - if (strSize > maxSize) { \ - *str++ = maxMask | ((strSize>>(chrsz*8))&maxSize); \ + if ((strSize) > maxSize) { \ + *(str)++ = maxMask | (((strSize)>>((chrsz)*8))&maxSize); \ } \ - *str++ = strSize; \ + *(str)++ = strSize; \ } status_t StringPool::writeStringBlock(const sp<AaptFile>& pool) diff --git a/tools/preload2/Android.mk b/tools/preload2/Android.mk index 35d28fbfeba8..ce877b3696c2 100644 --- a/tools/preload2/Android.mk +++ b/tools/preload2/Android.mk @@ -3,7 +3,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under,src) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk # To connect to devices (and take hprof dumps). LOCAL_STATIC_JAVA_LIBRARIES := ddmlib-prebuilt @@ -22,11 +21,8 @@ include $(BUILD_HOST_JAVA_LIBRARY) # Copy the preload-tool shell script to the host's bin directory. include $(CLEAR_VARS) LOCAL_IS_HOST_MODULE := true -LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE := preload-tool -include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/preload-tool $(ACP) - @echo "Copy: $(PRIVATE_MODULE) ($@)" - $(copy-file-to-new-target) - $(hide) chmod 755 $@ +LOCAL_SRC_FILES := preload-tool +LOCAL_REQUIRED_MODULES := preload2 +include $(BUILD_PREBUILT) diff --git a/tools/preload2/src/com/android/preload/DeviceUtils.java b/tools/preload2/src/com/android/preload/DeviceUtils.java index 72de7b58b0a7..803a7f195a59 100644 --- a/tools/preload2/src/com/android/preload/DeviceUtils.java +++ b/tools/preload2/src/com/android/preload/DeviceUtils.java @@ -285,7 +285,7 @@ public class DeviceUtils { if (device == null) { try { - wait(timeout); + wfdl.wait(timeout); } catch (InterruptedException e) { // Ignore spurious wakeups. } @@ -304,7 +304,7 @@ public class DeviceUtils { if (!device.hasClients()) { try { - wait(timeout); + wfcl.wait(timeout); } catch (InterruptedException e) { // Ignore spurious wakeups. } |