| commit | 4888b8ef094d457f4eec9ee2c4a92be5dc1aa847 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Tue Sep 01 16:50:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 16:50:36 2015 +0000 |
| tree | 55c194b7018e696d3e011ed7656c0d91f6b65440 | |
| parent | 5e3009f8d12840e5335eccb577bdea609f66bfd4 [diff] | |
| parent | 5fc83065f6d7f6277cbaa58570c8bfd22456a003 [diff] |
am 5fc83065: am 7bd30b73: Merge "Whitelist windows module" * commit '5fc83065f6d7f6277cbaa58570c8bfd22456a003': Whitelist windows module
diff --git a/Android.mk b/Android.mk index c8c0df7..e96c224 100644 --- a/Android.mk +++ b/Android.mk
@@ -44,6 +44,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_STATIC_LIBRARIES := libz LOCAL_MODULE:= libpng +LOCAL_MODULE_HOST_OS := darwin linux windows include $(BUILD_HOST_STATIC_LIBRARY)