| commit | 905dc8b76a98268a8047358ac55e14b4db18de8b | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Tue Sep 01 16:37:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 16:37:04 2015 +0000 |
| tree | 60d00ccc7c26cf60d7faffaf3618bb7a90143596 | |
| parent | 335e0e08e9d9c0265e0f171dccf8d9a7790e2218 [diff] | |
| parent | ce92141cbdfeae302fcc1d5e4b4b261c783feaf7 [diff] |
am ce92141c: Merge "Whitelist windows module" * commit 'ce92141cbdfeae302fcc1d5e4b4b261c783feaf7': Whitelist windows module
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index 18ad300..9fdbf54 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk
@@ -139,6 +139,7 @@ # LOCAL_MODULE:= libETC1 +LOCAL_MODULE_HOST_OS := darwin linux windows include $(BUILD_HOST_STATIC_LIBRARY)