diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-03-14 16:58:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-14 16:58:05 -0700 |
| commit | 3875d79ef6f125d82f99406e350bfe093594ec6f (patch) | |
| tree | e74f5c529df84616a265d459f2f7eace4fc14448 /opengl/tests | |
| parent | 1a26fd48c8e98fcee95d9cdd57f77709f4393260 (diff) | |
| parent | 9dde9efd0b6b4d1311d1313d0657a8e94b550989 (diff) | |
| download | frameworks_native-3875d79ef6f125d82f99406e350bfe093594ec6f.zip frameworks_native-3875d79ef6f125d82f99406e350bfe093594ec6f.tar.gz frameworks_native-3875d79ef6f125d82f99406e350bfe093594ec6f.tar.bz2 | |
Merge "frameworks/base: remove LOCAL_PRELINK_MODULE"
Diffstat (limited to 'opengl/tests')
| -rw-r--r-- | opengl/tests/gl2_jni/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/tests/gl_jni/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/tests/gl_perfapp/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/tests/gldual/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/tests/hwc/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/tests/lib/Android.mk | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/opengl/tests/gl2_jni/Android.mk b/opengl/tests/gl2_jni/Android.mk index 384966c..e8b6c57 100644 --- a/opengl/tests/gl2_jni/Android.mk +++ b/opengl/tests/gl2_jni/Android.mk @@ -44,7 +44,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libgl2jni -LOCAL_PRELINK_MODULE := false + include $(BUILD_SHARED_LIBRARY) diff --git a/opengl/tests/gl_jni/Android.mk b/opengl/tests/gl_jni/Android.mk index f1bd31d..4acd91f 100644 --- a/opengl/tests/gl_jni/Android.mk +++ b/opengl/tests/gl_jni/Android.mk @@ -46,7 +46,7 @@ LOCAL_MODULE := libgljni LOCAL_ARM_MODE := arm -LOCAL_PRELINK_MODULE := false + include $(BUILD_SHARED_LIBRARY) diff --git a/opengl/tests/gl_perfapp/Android.mk b/opengl/tests/gl_perfapp/Android.mk index dd75a74..4b79569 100644 --- a/opengl/tests/gl_perfapp/Android.mk +++ b/opengl/tests/gl_perfapp/Android.mk @@ -47,7 +47,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libglperf -LOCAL_PRELINK_MODULE := false + include $(BUILD_SHARED_LIBRARY) diff --git a/opengl/tests/gldual/Android.mk b/opengl/tests/gldual/Android.mk index 995a5d7..f1a998a 100644 --- a/opengl/tests/gldual/Android.mk +++ b/opengl/tests/gldual/Android.mk @@ -44,7 +44,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libgldualjni -LOCAL_PRELINK_MODULE := false + include $(BUILD_SHARED_LIBRARY) diff --git a/opengl/tests/hwc/Android.mk b/opengl/tests/hwc/Android.mk index 6312970..e4d7e28 100644 --- a/opengl/tests/hwc/Android.mk +++ b/opengl/tests/hwc/Android.mk @@ -29,7 +29,7 @@ LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_SHARED_LIBRARIES += libcutils libutils libstlport LOCAL_STATIC_LIBRARIES += libglTest -LOCAL_PRELINK_MODULE := false + include $(BUILD_STATIC_LIBRARY) diff --git a/opengl/tests/lib/Android.mk b/opengl/tests/lib/Android.mk index 7542ac4..ac1e183 100644 --- a/opengl/tests/lib/Android.mk +++ b/opengl/tests/lib/Android.mk @@ -27,6 +27,6 @@ LOCAL_C_INCLUDES += system/extras/tests/include \ LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_SHARED_LIBRARIES += libcutils libutils libstlport -LOCAL_PRELINK_MODULE := false + include $(BUILD_STATIC_LIBRARY) |