diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/post_process_props.py | 7 | ||||
| -rw-r--r-- | tools/zipalign/Android.mk | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tools/post_process_props.py b/tools/post_process_props.py index 01f9128..9d69736 100755 --- a/tools/post_process_props.py +++ b/tools/post_process_props.py @@ -21,7 +21,6 @@ import sys def mangle_build_prop(prop): pass - # Put the modifications that you need to make into the /system/build.prop into this # function. The prop object has get(name) and put(name,value) methods. def mangle_default_prop(prop): @@ -34,7 +33,11 @@ def mangle_default_prop(prop): else: val = val + ",adb" prop.put("persist.sys.usb.config", val) - + # UsbDeviceManager expects a value here. If it doesn't get it, it will + # default to "adb". That might not the right policy there, but it's better + # to be explicit. + if not prop.get("persist.sys.usb.config"): + prop.put("persist.sys.usb.config", "none"); class PropFile: def __init__(self, lines): diff --git a/tools/zipalign/Android.mk b/tools/zipalign/Android.mk index 9763bd2..089c68b 100644 --- a/tools/zipalign/Android.mk +++ b/tools/zipalign/Android.mk @@ -28,6 +28,10 @@ else LOCAL_LDLIBS += -lz endif +ifneq ($(strip $(BUILD_HOST_static)),) +LOCAL_LDLIBS += -lpthread +endif # BUILD_HOST_static + LOCAL_MODULE := zipalign include $(BUILD_HOST_EXECUTABLE) |