diff options
| author | Colin Cross <ccross@android.com> | 2014-01-28 00:46:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-28 00:46:31 +0000 |
| commit | 97d3f36a59ea448fa77e47a90bf04f1254670542 (patch) | |
| tree | 97a98ee89b81a2822b52c58353c2d4a0c880e035 | |
| parent | b9ba3f4ef0bc010edf2999fe4ac1ac7883bc288a (diff) | |
| parent | 39b588b9680a2ce28dc6a5000700c2b315d6a61c (diff) | |
| download | mesa3d-lollipop-dev.tar.gz | |
Merge "external/mesa3d: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseidea133-weekly-release
| -rw-r--r-- | src/egl/main/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/egl/main/Android.mk b/src/egl/main/Android.mk index a4a00f3bb35..2467ee9def4 100644 --- a/src/egl/main/Android.mk +++ b/src/egl/main/Android.mk @@ -148,7 +148,7 @@ LOCAL_STATIC_LIBRARIES := \ endif # MESA_BUILD_GALLIUM LOCAL_MODULE := libGLES_mesa -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl +LOCAL_MODULE_RELATIVE_PATH := egl include $(MESA_COMMON_MK) include $(BUILD_SHARED_LIBRARY) |