From patchwork Wed Mar 18 16:38:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chih-Wei Huang X-Patchwork-Id: 6041761 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B9F58BF90F for ; Wed, 18 Mar 2015 16:38:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D7EC4203F1 for ; Wed, 18 Mar 2015 16:38:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2DEC1201C0 for ; Wed, 18 Mar 2015 16:38:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 62EEE6E872; Wed, 18 Mar 2015 09:38:06 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ig0-f176.google.com (mail-ig0-f176.google.com [209.85.213.176]) by gabe.freedesktop.org (Postfix) with ESMTP id AE96F6E86B for ; Wed, 18 Mar 2015 09:38:04 -0700 (PDT) Received: by igbue6 with SMTP id ue6so105168009igb.1 for ; Wed, 18 Mar 2015 09:38:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=2jpKYE6j+US+QnYaXxLu0OdO3KD9qWzL+OOHVYrmobg=; b=DnhFzt6sIjZxz/Almxob6e49cP6Ib6mhzWD92BTd1pVT3Qgn9dOeZ6qPtRDY2tgheK S3a7MVGUZdX0YMYQ7vhef7Cj4UXovA39ZyOrrFvIFa3IwwhTUJAwT1oS0K0pG8eJlfGs k6hfTq5+mSqj20BU+Tha+lP6BhApdq+89k+eYCMxI/jMe4PV7TX3EdSXqO39tUVpMZ2S tYRTqqnM0uJ92zA38FWD9TXZ9fX6WX7AkY3LQKQNBGHG2ECZRqv9/T2guEH8V2b3QJH9 ZuLikpJf491/LGbVnrvYo1vgxRCufeltFvY3Cd1UpIAwC64aRAB74ZQIBRLR8khF0HX2 uyQA== X-Gm-Message-State: ALoCoQkKEUrSefV+qKO60bNRdIhBgzblgreYbjo9byhSZ4VPkTBo5zmuh5gyTePc6bdvHHCr/Acj MIME-Version: 1.0 X-Received: by 10.42.14.131 with SMTP id h3mr21184072ica.7.1426696684216; Wed, 18 Mar 2015 09:38:04 -0700 (PDT) Received: by 10.107.14.74 with HTTP; Wed, 18 Mar 2015 09:38:04 -0700 (PDT) X-Originating-IP: [220.132.35.215] In-Reply-To: References: <1426635012-27971-1-git-send-email-emil.l.velikov@gmail.com> Date: Thu, 19 Mar 2015 00:38:04 +0800 Message-ID: Subject: Re: [PATCH libdrm 0/5] Yet another round of Android build cleanups From: Chih-Wei Huang To: Emil Velikov Cc: ML dri-devel 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: , 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, T_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 2015-03-18 9:37 GMT+08:00 Emil Velikov : > On 18 March 2015 at 01:19, Chih-Wei Huang wrote: >> >> I would suggest to remove all the use of LIBDRM_TOP. >> Do you want me to submit a patch? > Hmm I'm not sure that things will work correctly if we directly > substitute LIBDRM_TOP with LOCAL_PATH within the following. > > mkfiles := $(patsubst %,$(LIBDRM_TOP)/%/Android.mk,$(SUBDIRS)) Sure. It works. But I prefer to simplify it by android build system built-in functions. See the attached 0001-* patch. 0002-* removes LIBDRM_TOP entirely. > Can you send a patch over ? From 93f7cc2ced4c7fdad0f0485c87b5db12cd98eddd Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Thu, 19 Mar 2015 00:26:59 +0800 Subject: [PATCH 2/2] android: get rid of LIBDRM_TOP Signed-off-by: Chih-Wei Huang --- Android.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index bad4fe1..7038c3c 100644 --- a/Android.mk +++ b/Android.mk @@ -24,8 +24,6 @@ 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 @@ -38,7 +36,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(LOCAL_PATH)/include/drm LOCAL_C_INCLUDES := \ - $(LIBDRM_TOP)/include/drm + $(LOCAL_PATH)/include/drm LOCAL_CFLAGS := \ -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 -- 1.9.1