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 /Android.mk | |
parent | bd4d0d244019a72be9ca51ac3e8f35201b271f1b (diff) | |
parent | b38a4b2326c1be5702f5cb73a53c0ed74c12d510 (diff) | |
download | external-libdrm-870942e56aac024da5e0a621275f6561a4ddab1b.tar.gz external-libdrm-870942e56aac024da5e0a621275f6561a4ddab1b.tar.xz external-libdrm-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 'Android.mk')
-rw-r--r-- | Android.mk | 49 |
1 files changed, 29 insertions, 20 deletions
@@ -26,35 +26,44 @@ LOCAL_PATH := $(call my-dir) | |||
26 | # Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES | 26 | # Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES |
27 | include $(LOCAL_PATH)/Makefile.sources | 27 | include $(LOCAL_PATH)/Makefile.sources |
28 | 28 | ||
29 | common_CFLAGS := -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | 29 | common_CFLAGS := \ |
30 | -DHAVE_VISIBILITY=1 \ | ||
31 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | ||
30 | 32 | ||
31 | # Static library for the device (recovery) | 33 | # Static library for the device (recovery) |
32 | include $(CLEAR_VARS) | 34 | include $(CLEAR_VARS) |
33 | LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES)) | 35 | |
34 | LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH) $(LOCAL_PATH)/include/drm | ||
35 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/drm | ||
36 | LOCAL_CFLAGS := $(common_CFLAGS) | ||
37 | LOCAL_MODULE := libdrm | 36 | LOCAL_MODULE := libdrm |
37 | |||
38 | LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES)) | ||
39 | LOCAL_EXPORT_C_INCLUDE_DIRS := \ | ||
40 | $(LOCAL_PATH) \ | ||
41 | $(LOCAL_PATH)/include/drm | ||
42 | |||
43 | LOCAL_C_INCLUDES := \ | ||
44 | $(LOCAL_PATH)/include/drm | ||
45 | |||
46 | LOCAL_CFLAGS := \ | ||
47 | $(common_CFLAGS) | ||
48 | |||
38 | include $(BUILD_STATIC_LIBRARY) | 49 | include $(BUILD_STATIC_LIBRARY) |
39 | 50 | ||
40 | # Dynamic library for the device | 51 | # Dynamic library for the device |
41 | include $(CLEAR_VARS) | 52 | include $(CLEAR_VARS) |
42 | LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES)) | ||
43 | LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH) $(LOCAL_PATH)/include/drm | ||
44 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/drm | ||
45 | LOCAL_CFLAGS := $(common_CFLAGS) | ||
46 | 53 | ||
47 | LOCAL_MODULE := libdrm | 54 | LOCAL_MODULE := libdrm |
55 | |||
56 | LOCAL_SRC_FILES := $(filter-out %.h,$(LIBDRM_FILES)) | ||
57 | LOCAL_EXPORT_C_INCLUDE_DIRS := \ | ||
58 | $(LOCAL_PATH) \ | ||
59 | $(LOCAL_PATH)/include/drm | ||
60 | |||
61 | LOCAL_C_INCLUDES := \ | ||
62 | $(LOCAL_PATH)/include/drm | ||
63 | |||
64 | LOCAL_CFLAGS := \ | ||
65 | $(common_CFLAGS) | ||
66 | |||
48 | include $(BUILD_SHARED_LIBRARY) | 67 | include $(BUILD_SHARED_LIBRARY) |
49 | 68 | ||
50 | SUBDIRS := \ | 69 | include $(call all-makefiles-under,$(LOCAL_PATH)) |
51 | nouveau \ | ||
52 | radeon \ | ||
53 | rockchip \ | ||
54 | tegra \ | ||
55 | libkms \ | ||
56 | tests/modetest \ | ||
57 | tests/planetest | ||
58 | |||
59 | mkfiles := $(patsubst %,$(LOCAL_PATH)/%/Android.mk,$(SUBDIRS)) | ||
60 | include $(mkfiles) | ||