| commit | 41eabee5dbe3562140849a071c97a98bc8788d8d | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Tue Sep 01 17:04:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 17:04:43 2015 +0000 |
| tree | 467f2635d31edc8aab571dc6afd358546b4c354a | |
| parent | 019554f6483a80524e27e64e8b1be6f9a125e32c [diff] | |
| parent | fe54df2ad3244d1cb745a6aac868654f0fc05315 [diff] |
am fe54df2a: am 905dc8b7: am ce92141c: Merge "Whitelist windows module" * commit 'fe54df2ad3244d1cb745a6aac868654f0fc05315': Whitelist windows module
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index 8d42690..29749c0 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk
@@ -144,6 +144,7 @@ # LOCAL_MODULE:= libETC1 +LOCAL_MODULE_HOST_OS := darwin linux windows include $(BUILD_HOST_STATIC_LIBRARY)