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 a4ea7d7..67e9284 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -35,10 +35,20 @@ emugl-begin-module = \
     $(eval LOCAL_IS_HOST_MODULE := $(if $3,true,))\
     $(eval LOCAL_C_INCLUDES := $(EMUGL_COMMON_INCLUDES)) \
     $(eval LOCAL_CFLAGS := $(EMUGL_COMMON_CFLAGS)) \
-    $(eval LOCAL_PRELINK_MODULE := false)\
     $(eval _EMUGL_INCLUDE_TYPE := $(BUILD_$2)) \
     $(call _emugl-init-module,$1,$2,$3)
 
+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 = \
     $(eval include $(_EMUGL_INCLUDE_TYPE))\
@@ -233,6 +243,16 @@ endef
 # library path (i.e. not under /system/lib
 # $1: library sub-path,relative to /system/lib
 # For example: $(call emugl-set-shared-library-subpath,egl)
-emugl-set-shared-library-subpath = \
-    $(eval LOCAL_MODULE_RELATIVE_PATH := $1)\
-    $(eval _emugl.$(LOCAL_MODULE).moved := true)
+
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 21 && echo PreLollipop),PreLollipop)
+    emugl-set-shared-library-subpath = \
+        $(eval LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$1)\
+        $(eval LOCAL_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$1)\
+        $(eval _emugl.$(LOCAL_MODULE).moved := true)\
+        $(call emugl-export-outer,ADDITIONAL_DEPENDENCIES,$(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)$(TARGET_SHLIB_SUFFIX))
+else
+    emugl-set-shared-library-subpath = \
+        $(eval LOCAL_MODULE_RELATIVE_PATH := $1)\
+        $(eval _emugl.$(LOCAL_MODULE).moved := true)
+endif
+