Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 0bff4a1296 am...

[android-x86/device-generic-goldfish-opengl.git] / common.mk

diff --git a/common.mk b/common.mk
index 4500a70..67e9284 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -41,10 +41,13 @@ emugl-begin-module = \
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow)
     emugl-begin-module += $(eval include external/stlport/libstlport.mk)
 endif
-
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 21 && echo PreLollipop),PreLollipop)
     emugl-begin-module += $(eval LOCAL_PRELINK_MODULE := false)
 endif
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 19 && echo PreKitkat),PreKitkat)
+    emugl-begin-module += $(eval LOCAL_MODULE_TAGS := debug)
+    emugl-begin-module += $(eval LOCAL_SHARED_LIBRARIES += libstlport)
+endif
 
 # Used to end a module definition, see function definitions above
 emugl-end-module = \