diff options
author | Colin Cross <ccross@android.com> | 2014-01-28 01:12:47 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-28 01:12:47 +0000 |
commit | ea350ea65a44131452e9e9059d92138201df59f4 (patch) | |
tree | cf0257af9ae9d65ba4f49197ab64f00067e0d0d2 /opengl | |
parent | 809af3aa03294a8de2cb9cfee6e2686a2bf99ac1 (diff) | |
parent | dec678dbd240e5c53afac8c3901d5beb23706378 (diff) | |
download | frameworks_native-ea350ea65a44131452e9e9059d92138201df59f4.zip frameworks_native-ea350ea65a44131452e9e9059d92138201df59f4.tar.gz frameworks_native-ea350ea65a44131452e9e9059d92138201df59f4.tar.bz2 |
am dec678db: am a21ba585: am 55f0668f: Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit 'dec678dbd240e5c53afac8c3901d5beb23706378':
frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Diffstat (limited to 'opengl')
-rw-r--r-- | opengl/libagl/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk index 9886bf0..95a8ef2 100644 --- a/opengl/libagl/Android.mk +++ b/opengl/libagl/Android.mk @@ -44,7 +44,7 @@ endif # we need to access the private Bionic header <bionic_tls.h> LOCAL_C_INCLUDES += bionic/libc/private -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl +LOCAL_MODULE_RELATIVE_PATH := egl LOCAL_MODULE:= libGLES_android include $(BUILD_SHARED_LIBRARY) |