| Message ID | 1454083247-17807-1-git-send-email-robh@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 29 January 2016 at 16:00, Rob Herring <robh@kernel.org> wrote: > From: Sumit Semwal <sumit.semwal@linaro.org> > > Android needs libdrm built statically for recovery; > enable that as well. > > Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org> > Signed-off-by: Rob Herring <robh@kernel.org> > Cc: Chih-Wei Huang <cwhuang@linux.org.tw> > Cc: Emil Velikov <emil.l.velikov@gmail.com> > --- > I posted this to mesa-dev, but I guess libdrm patches are supposed to go > to dri-devel. > Thanks Rob. I've pushed all outstanding libdrm patches that I could find. Do let me know if I missed anything. -Emil
On Thu, Feb 4, 2016 at 7:30 AM, Emil Velikov <emil.l.velikov@gmail.com> wrote: > On 29 January 2016 at 16:00, Rob Herring <robh@kernel.org> wrote: >> From: Sumit Semwal <sumit.semwal@linaro.org> >> >> Android needs libdrm built statically for recovery; >> enable that as well. >> >> Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org> >> Signed-off-by: Rob Herring <robh@kernel.org> >> Cc: Chih-Wei Huang <cwhuang@linux.org.tw> >> Cc: Emil Velikov <emil.l.velikov@gmail.com> >> --- >> I posted this to mesa-dev, but I guess libdrm patches are supposed to go >> to dri-devel. >> > Thanks Rob. > > I've pushed all outstanding libdrm patches that I could find. Do let > me know if I missed anything. Thanks. That's the only one I had for libdrm. Rob
diff --git a/Android.mk b/Android.mk index 90cdcb3..1d8cd65 100644 --- a/Android.mk +++ b/Android.mk @@ -27,6 +27,8 @@ include $(CLEAR_VARS) # Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES include $(LOCAL_PATH)/Makefile.sources +#static library for the device (recovery) +include $(CLEAR_VARS) LOCAL_MODULE := libdrm LOCAL_MODULE_TAGS := optional @@ -41,7 +43,24 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := \ -DHAVE_VISIBILITY=1 \ -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 +include $(BUILD_STATIC_LIBRARY) + +# Shared library for the device +include $(CLEAR_VARS) +LOCAL_MODULE := libdrm +LOCAL_MODULE_TAGS := optional +LOCAL_SRC_FILES := $(LIBDRM_FILES) +LOCAL_EXPORT_C_INCLUDE_DIRS := \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/include/drm + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/include/drm + +LOCAL_CFLAGS := \ + -DHAVE_VISIBILITY=1 \ + -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 include $(BUILD_SHARED_LIBRARY) include $(call all-makefiles-under,$(LOCAL_PATH))