Build libdrm as a static library for recovery

Change-Id: I86971ebc28f615a1c6d5548191379583b0404960
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>

1 files changed, 18 insertions, 17 deletions

diff --git a/Android.mk b/Android.mk
index e83e5c69..966514dd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,36 +21,39 @@
 # IN THE SOFTWARE.
 #
 
-ifeq ($(strip $(BOARD_USES_LIBDRM)),true)
-
 LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
 LIBDRM_TOP := $(LOCAL_PATH)
 
 # Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES
 include $(LOCAL_PATH)/Makefile.sources
 
-LOCAL_MODULE := libdrm
-LOCAL_MODULE_TAGS := optional
+common_CFLAGS := -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
 
+# Static library for the device (recovery)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(LIBDRM_FILES)
-LOCAL_EXPORT_C_INCLUDE_DIRS += \
-        $(LOCAL_PATH) \
-        $(LOCAL_PATH)/include/drm
-
-LOCAL_C_INCLUDES := \
-        $(LIBDRM_TOP)/include/drm
+LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH) $(LOCAL_PATH)/include/drm
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/drm
+LOCAL_CFLAGS := $(common_CFLAGS)
+LOCAL_MODULE := libdrm
+include $(BUILD_STATIC_LIBRARY)
 
-LOCAL_CFLAGS := \
-        -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
+# Dynamic library for the device
+include $(CLEAR_VARS)
+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 := $(common_CFLAGS)
 
 LOCAL_COPY_HEADERS := \
         $(LIBDRM_H_FILES) \
         $(LIBDRM_INCLUDE_H_FILES) \
         $(LIBDRM_INCLUDE_VMWGFX_H_FILES)
-
 LOCAL_COPY_HEADERS_TO := libdrm
+
+LOCAL_MODULE := libdrm
 include $(BUILD_SHARED_LIBRARY)
 
 SUBDIRS := \
@@ -64,5 +67,3 @@ SUBDIRS := \
 
 mkfiles := $(patsubst %,$(LIBDRM_TOP)/%/Android.mk,$(SUBDIRS))
 include $(mkfiles)
-
-endif