diff options
| author | D. Andrei Măceș <dmaces@nd.edu> | 2016-04-18 14:47:42 -0400 |
|---|---|---|
| committer | Andreas Blaesius <skate4life@gmx.de> | 2017-02-25 21:49:10 +0100 |
| commit | 9fa9f2764f6f14de80f2dcc3d622a6beaacb4627 (patch) | |
| tree | 86a9cf71033a98e853a1dd8915ca42a2f3c0ff94 | |
| parent | 54ef62c711fb27b4651817d3307210b7eee87c08 (diff) | |
| download | hardware_ti_omap4-9fa9f2764f6f14de80f2dcc3d622a6beaacb4627.zip hardware_ti_omap4-9fa9f2764f6f14de80f2dcc3d622a6beaacb4627.tar.gz hardware_ti_omap4-9fa9f2764f6f14de80f2dcc3d622a6beaacb4627.tar.bz2 | |
pvrsrvinit/libEGL_POWERVR: Link against generic library symlinks
Since newer DDKs may expect more generic UM prebuilt names, link
against the symlinks prepared in vendor/ti, rather than matching
against TARGET_BOARD_OMAP_CPU every time.
Change-Id: Ibc6a3b4f92984f787ddbe9eba596875b9fbd7c26
| -rw-r--r-- | libEGL_POWERVR/Android.mk | 10 | ||||
| -rw-r--r-- | pvrsrvinit/Android.mk | 12 |
2 files changed, 5 insertions, 17 deletions
diff --git a/libEGL_POWERVR/Android.mk b/libEGL_POWERVR/Android.mk index ef9d738..121cab9 100644 --- a/libEGL_POWERVR/Android.mk +++ b/libEGL_POWERVR/Android.mk @@ -1,17 +1,11 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -ifeq ($(TARGET_BOARD_OMAP_CPU),4470) -LOCAL_SGX_CORE := 544_112 -else -LOCAL_SGX_CORE := 540_120 -endif - LOCAL_SRC_FILES := egl.c LOCAL_CFLAGS := -Wall -Werror LOCAL_LDFLAGS := -L $(TARGET_OUT_VENDOR_SHARED_LIBRARIES) -LOCAL_LDLIBS := -lIMGegl_SGX$(LOCAL_SGX_CORE) -libEGL_POWERVR_SGX54X: $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/libIMGegl_SGX$(LOCAL_SGX_CORE).so +LOCAL_LDLIBS := -lIMGegl +libEGL_POWERVR_SGX54X: $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/libIMGegl.so LOCAL_MODULE := libEGL_POWERVR_SGX54X LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/egl diff --git a/pvrsrvinit/Android.mk b/pvrsrvinit/Android.mk index 4f29824..f6baee3 100644 --- a/pvrsrvinit/Android.mk +++ b/pvrsrvinit/Android.mk @@ -4,15 +4,9 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := pvrsrvinit.c LOCAL_LDFLAGS := -L $(TARGET_OUT_VENDOR)/lib -ifeq ($(TARGET_BOARD_OMAP_CPU),4470) -LOCAL_LDFLAGS += -lsrv_init_SGX544_112 -lsrv_um_SGX544_112 -pvrsrvinit: $(TARGET_OUT_VENDOR)/lib/libsrv_init_SGX544_112.so -pvrsrvinit: $(TARGET_OUT_VENDOR)/lib/libsrv_um_SGX544_112.so -else -LOCAL_LDFLAGS += -lsrv_init_SGX540_120 -lsrv_um_SGX540_120 -pvrsrvinit: $(TARGET_OUT_VENDOR)/lib/libsrv_init_SGX540_120.so -pvrsrvinit: $(TARGET_OUT_VENDOR)/lib/libsrv_um_SGX540_120.so -endif +LOCAL_LDFLAGS += -lsrv_init -lsrv_um +pvrsrvinit: $(TARGET_OUT_VENDOR)/lib/libsrv_init.so +pvrsrvinit: $(TARGET_OUT_VENDOR)/lib/libsrv_um.so LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES) LOCAL_MODULE := pvrsrvinit LOCAL_MODULE_TAGS := optional |