From patchwork Fri Jan 29 16:00:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 8164611 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7C9CB9F38B for ; Fri, 29 Jan 2016 16:01:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B304F20390 for ; Fri, 29 Jan 2016 16:01:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DEC5320383 for ; Fri, 29 Jan 2016 16:00:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A01A86E3EC; Fri, 29 Jan 2016 08:00:57 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ob0-f194.google.com (mail-ob0-f194.google.com [209.85.214.194]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0DC326E3EC for ; Fri, 29 Jan 2016 08:00:56 -0800 (PST) Received: by mail-ob0-f194.google.com with SMTP id wg8so4831784obc.3 for ; Fri, 29 Jan 2016 08:00:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=CU+aTja2EQdFcw3XBTY+5eGsVfIRMf/jmWL7vJgGxqk=; b=BxErWjS90nDUXRl1OPOhrIFPu4lMQYc5xJvtB0o754jhVB5LlotZ4FDlwoTfm/mzT3 KfqeCJxQkTmXFiwqZZZU6BkNzgdbA4vRSyLx4ut5p/wE2WUVEb7UsZefHbKb0I+PvXxN hpQuBNkRT/zUN8DLVycCLbMkOWGfgfHql/vO1s065AP+zNO7DLUEtFoiNRTlNFAYTvoi MQeRLADxSXtSjoXEQRN9DP1eqO3Qx+Y7xCJEQU18lHzw3U7BUttAjgB/cdv0ZepSg1W4 mJzALMu9JQ/MTsYULMomB0XLly/s8gED2QeOumTT3SxDeQ2js44i2cMoLLxCquAJEamP bHyw== X-Gm-Message-State: AG10YOR4ZXQaG/B2XNhEKvP2qY1YObVXTedL4C7kklhiTScFPTjTdsXKfi9iUy5puLqwmg== X-Received: by 10.60.62.97 with SMTP id x1mr6970639oer.74.1454083255273; Fri, 29 Jan 2016 08:00:55 -0800 (PST) Received: from rob-hp-laptop.herring.priv (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by smtp.googlemail.com with ESMTPSA id mj1sm8164318oeb.17.2016.01.29.08.00.54 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 29 Jan 2016 08:00:54 -0800 (PST) From: Rob Herring To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm] android: enable building static version of libdrm Date: Fri, 29 Jan 2016 10:00:47 -0600 Message-Id: <1454083247-17807-1-git-send-email-robh@kernel.org> X-Mailer: git-send-email 2.5.0 Cc: Emil Velikov , Chih-Wei Huang X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sumit Semwal Android needs libdrm built statically for recovery; enable that as well. Signed-off-by: Sumit Semwal Signed-off-by: Rob Herring Cc: Chih-Wei Huang Cc: Emil Velikov --- I posted this to mesa-dev, but I guess libdrm patches are supposed to go to dri-devel. Rob Android.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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))