system/corennnnn
| Revision | 73c59ad77c206edba4d01c47f75de7dbf118d016 (tree) |
|---|---|
| Time | 2016-08-12 05:09:30 |
| Author | TreeHugger Robot <treehugger-gerrit@goog...> |
| Commiter | Android (Google) Code Review |
Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev
adb/Android.mk (diff)
adb/sysdeps/mutex.h (diff)| @@ -200,10 +200,7 @@ endif | ||
| 200 | 200 | # will violate ODR |
| 201 | 201 | LOCAL_SHARED_LIBRARIES := |
| 202 | 202 | |
| 203 | -# Don't build the host adb on Windows (this branch should only be used for security updates.) | |
| 204 | -ifneq ($(HOST_OS),windows) | |
| 205 | 203 | include $(BUILD_HOST_EXECUTABLE) |
| 206 | -endif | |
| 207 | 204 | |
| 208 | 205 | $(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE)) |
| 209 | 206 |
| @@ -20,7 +20,7 @@ | ||
| 20 | 20 | |
| 21 | 21 | #include <windows.h> |
| 22 | 22 | |
| 23 | -#include <android-base/macros.h> | |
| 23 | +#include <base/macros.h> | |
| 24 | 24 | |
| 25 | 25 | #include "adb.h" |
| 26 | 26 |
Fork