diff options
| author | Sean Paul | 2016-02-03 09:52:15 -0600 |
|---|---|---|
| committer | Sean Paul | 2016-02-03 09:52:15 -0600 |
| commit | 870942e56aac024da5e0a621275f6561a4ddab1b (patch) | |
| tree | f50e065f5088a40e2a34ae83e2e3ff6ab2e6f625 /tests/modetest/Android.mk | |
| parent | bd4d0d244019a72be9ca51ac3e8f35201b271f1b (diff) | |
| parent | b38a4b2326c1be5702f5cb73a53c0ed74c12d510 (diff) | |
| download | external-libgbm-870942e56aac024da5e0a621275f6561a4ddab1b.tar.gz external-libgbm-870942e56aac024da5e0a621275f6561a4ddab1b.tar.xz external-libgbm-870942e56aac024da5e0a621275f6561a4ddab1b.zip | |
Merge tag 'tags/libdrm-2.4.66' into master
Tag libdrm-2.4.66 from git://anongit.freedesktop.org/mesa/drm
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Conflicts:
Android.mk
Makefile.am
configure.ac
freedreno/Android.mk
include/drm/drm_mode.h
intel/Android.mk
libkms/Android.mk
nouveau/Android.mk
radeon/Android.mk
tegra/tegra.c
tests/Makefile.am
xf86drmMode.c
xf86drmMode.h
Change-Id: I3186bde7f196d2f3438c4334591ee2a0c1371c96
Diffstat (limited to 'tests/modetest/Android.mk')
| -rw-r--r-- | tests/modetest/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/modetest/Android.mk b/tests/modetest/Android.mk index 6507b48b..ccdae6c8 100644 --- a/tests/modetest/Android.mk +++ b/tests/modetest/Android.mk | |||
| @@ -8,5 +8,6 @@ LOCAL_SRC_FILES := $(filter-out %.h,$(MODETEST_FILES)) | |||
| 8 | LOCAL_MODULE := modetest | 8 | LOCAL_MODULE := modetest |
| 9 | 9 | ||
| 10 | LOCAL_SHARED_LIBRARIES := libdrm | 10 | LOCAL_SHARED_LIBRARIES := libdrm |
| 11 | LOCAL_STATIC_LIBRARIES := libdrm_util | ||
| 11 | 12 | ||
| 12 | include $(BUILD_EXECUTABLE) | 13 | include $(BUILD_EXECUTABLE) |