diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-12 15:16:39 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-12 15:16:39 +0100 |
| commit | bd9837c3559f8e545bdb6bd4010b0e2d6e6297c4 (patch) | |
| tree | 4af1be2ac6814a892f91168089f6d3980bcf6931 /adb/Android.mk | |
| parent | 870d7cfb19f49ced89117b403972eef4a05faf08 (diff) | |
| parent | 656154a5b4127370f7317852e224a9121c6beed3 (diff) | |
| download | system_core-bd9837c3559f8e545bdb6bd4010b0e2d6e6297c4.tar.gz system_core-bd9837c3559f8e545bdb6bd4010b0e2d6e6297c4.tar.bz2 system_core-bd9837c3559f8e545bdb6bd4010b0e2d6e6297c4.zip | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_system_core into replicant-6.0
Diffstat (limited to 'adb/Android.mk')
| -rw-r--r-- | adb/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 425bf9ba5..d4adbfb6a 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -200,7 +200,10 @@ endif # will violate ODR LOCAL_SHARED_LIBRARIES := +# Don't build the host adb on Windows (this branch should only be used for security updates.) +ifneq ($(HOST_OS),windows) include $(BUILD_HOST_EXECUTABLE) +endif $(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE)) |