| Message ID | 1410125413-19465-8-git-send-email-emil.l.velikov@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Sun, Sep 7, 2014 at 11:30 PM, Emil Velikov <emil.l.velikov@gmail.com> wrote: > Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org> > Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> > --- > Android.mk | 3 ++- > libkms/Android.mk | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 55 insertions(+), 1 deletion(-) > create mode 100644 libkms/Android.mk Not super familiar with Android build system but it looks good to me: Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> Cheers, Jakob. > > diff --git a/Android.mk b/Android.mk > index 97a7d75..4d02b05 100644 > --- a/Android.mk > +++ b/Android.mk > @@ -55,7 +55,8 @@ SUBDIRS := \ > freedreno \ > intel \ > nouveau \ > - radeon > + radeon \ > + libkms > > mkfiles := $(patsubst %,$(LIBDRM_TOP)/%/Android.mk,$(SUBDIRS)) > include $(mkfiles) > diff --git a/libkms/Android.mk b/libkms/Android.mk > new file mode 100644 > index 0000000..d2df32a > --- /dev/null > +++ b/libkms/Android.mk > @@ -0,0 +1,53 @@ > +DRM_GPU_DRIVERS := $(strip $(filter-out swrast, $(BOARD_GPU_DRIVERS))) > + > +intel_drivers := i915 i965 i915g ilo > +radeon_drivers := r300g r600g radeonsi > +nouveau_drivers := nouveau > +vmwgfx_drivers := vmwgfx > + > +valid_drivers := \ > + $(intel_drivers) \ > + $(radeon_drivers) \ > + $(nouveau_drivers) \ > + $(vmwgfx_drivers) > + > +# warn about invalid drivers > +invalid_drivers := $(filter-out $(valid_drivers), $(DRM_GPU_DRIVERS)) > +ifneq ($(invalid_drivers),) > +$(warning invalid GPU drivers: $(invalid_drivers)) > +# tidy up > +DRM_GPU_DRIVERS := $(filter-out $(invalid_drivers), $(DRM_GPU_DRIVERS)) > +endif > + > +LOCAL_PATH := $(call my-dir) > + > +include $(CLEAR_VARS) > +include $(LOCAL_PATH)/Makefile.sources > + > +LOCAL_SRC_FILES := $(LIBKMS_FILES) > + > +ifneq ($(filter $(vmwgfx_drivers), $(DRM_GPU_DRIVERS)),) > +LOCAL_SRC_FILES += $(LIBKMS_VMWGFX_FILES) > +endif > + > +ifneq ($(filter $(intel_drivers), $(DRM_GPU_DRIVERS)),) > +LOCAL_SRC_FILES += $(LIBKMS_INTEL_FILES) > +endif > + > +ifneq ($(filter $(nouveau_drivers), $(DRM_GPU_DRIVERS)),) > +LOCAL_SRC_FILES += $(LIBKMS_NOUVEAU_FILES) > +endif > + > +ifneq ($(filter $(radeon_drivers), $(DRM_GPU_DRIVERS)),) > +LOCAL_SRC_FILES += $(LIBKMS_RADEON_FILES) > +endif > + > +LOCAL_MODULE := libkms > +LOCAL_SHARED_LIBRARIES := libdrm > + > +LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm > + > +LOCAL_COPY_HEADERS_TO := libdrm > +LOCAL_COPY_HEADERS := $(LIBKMS_H_FILES) > + > +include $(BUILD_SHARED_LIBRARY) > -- > 2.0.2 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/Android.mk b/Android.mk index 97a7d75..4d02b05 100644 --- a/Android.mk +++ b/Android.mk @@ -55,7 +55,8 @@ SUBDIRS := \ freedreno \ intel \ nouveau \ - radeon + radeon \ + libkms mkfiles := $(patsubst %,$(LIBDRM_TOP)/%/Android.mk,$(SUBDIRS)) include $(mkfiles) diff --git a/libkms/Android.mk b/libkms/Android.mk new file mode 100644 index 0000000..d2df32a --- /dev/null +++ b/libkms/Android.mk @@ -0,0 +1,53 @@ +DRM_GPU_DRIVERS := $(strip $(filter-out swrast, $(BOARD_GPU_DRIVERS))) + +intel_drivers := i915 i965 i915g ilo +radeon_drivers := r300g r600g radeonsi +nouveau_drivers := nouveau +vmwgfx_drivers := vmwgfx + +valid_drivers := \ + $(intel_drivers) \ + $(radeon_drivers) \ + $(nouveau_drivers) \ + $(vmwgfx_drivers) + +# warn about invalid drivers +invalid_drivers := $(filter-out $(valid_drivers), $(DRM_GPU_DRIVERS)) +ifneq ($(invalid_drivers),) +$(warning invalid GPU drivers: $(invalid_drivers)) +# tidy up +DRM_GPU_DRIVERS := $(filter-out $(invalid_drivers), $(DRM_GPU_DRIVERS)) +endif + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +include $(LOCAL_PATH)/Makefile.sources + +LOCAL_SRC_FILES := $(LIBKMS_FILES) + +ifneq ($(filter $(vmwgfx_drivers), $(DRM_GPU_DRIVERS)),) +LOCAL_SRC_FILES += $(LIBKMS_VMWGFX_FILES) +endif + +ifneq ($(filter $(intel_drivers), $(DRM_GPU_DRIVERS)),) +LOCAL_SRC_FILES += $(LIBKMS_INTEL_FILES) +endif + +ifneq ($(filter $(nouveau_drivers), $(DRM_GPU_DRIVERS)),) +LOCAL_SRC_FILES += $(LIBKMS_NOUVEAU_FILES) +endif + +ifneq ($(filter $(radeon_drivers), $(DRM_GPU_DRIVERS)),) +LOCAL_SRC_FILES += $(LIBKMS_RADEON_FILES) +endif + +LOCAL_MODULE := libkms +LOCAL_SHARED_LIBRARIES := libdrm + +LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm + +LOCAL_COPY_HEADERS_TO := libdrm +LOCAL_COPY_HEADERS := $(LIBKMS_H_FILES) + +include $(BUILD_SHARED_LIBRARY)
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> --- Android.mk | 3 ++- libkms/Android.mk | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 libkms/Android.mk