From patchwork Tue May 16 13:24:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arkadiusz Hiler X-Patchwork-Id: 9729215 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 441E8602B4 for ; Tue, 16 May 2017 13:25:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36DEF28653 for ; Tue, 16 May 2017 13:25:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2BC8928A24; Tue, 16 May 2017 13:25:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D6A2528653 for ; Tue, 16 May 2017 13:25:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A52676E30F; Tue, 16 May 2017 13:25:40 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C7E86E30A for ; Tue, 16 May 2017 13:25:39 +0000 (UTC) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP; 16 May 2017 06:25:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,349,1491289200"; d="scan'208";a="87981689" Received: from ahiler-desk.igk.intel.com ([172.28.171.131]) by orsmga004.jf.intel.com with ESMTP; 16 May 2017 06:25:38 -0700 From: Arkadiusz Hiler To: intel-gfx@lists.freedesktop.org Date: Tue, 16 May 2017 15:24:59 +0200 Message-Id: <20170516132502.9772-11-arkadiusz.hiler@intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170516132502.9772-1-arkadiusz.hiler@intel.com> References: <20170516132502.9772-1-arkadiusz.hiler@intel.com> Organization: Intel Technology Poland sp. z o.o. - KRS 101882 - ul. Slowackiego 173, 80-298 Gdansk Subject: [Intel-gfx] [PATCH i-g-t 10/13] Android.mk: Use drm stubs X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Use drm stubs that sit under lib/stubs. Also drop strange, nonexistent additions to LOCAL_C_INCLUDES. Signed-off-by: Arkadiusz Hiler --- benchmarks/Android.mk | 3 ++- demos/Android.mk | 3 ++- lib/Android.mk | 4 ++-- lib/tests/Android.mk | 4 ++-- tests/Android.mk | 4 ++-- tools/Android.mk | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk index faa73b7..4ea275c 100644 --- a/benchmarks/Android.mk +++ b/benchmarks/Android.mk @@ -10,7 +10,8 @@ define add_benchmark LOCAL_SRC_FILES := $1.c - LOCAL_C_INCLUDES = ${IGT_LOCAL_C_INCLUDES} + LOCAL_C_INCLUDES = ${IGT_LOCAL_C_INCLUDES} \ + $(LOCAL_PATH)/../lib/stubs/drm/ LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM LOCAL_CFLAGS += -DANDROID -UNDEBUG -include "check-ndebug.h" LOCAL_CFLAGS += -std=gnu99 diff --git a/demos/Android.mk b/demos/Android.mk index 90d8b37..1f50fdc 100644 --- a/demos/Android.mk +++ b/demos/Android.mk @@ -16,7 +16,8 @@ LOCAL_CFLAGS += -std=gnu99 # Excessive complaining for established cases. Rely on the Linux version warnings. LOCAL_CFLAGS += -Wno-sign-compare -LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib +LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib \ + $(LOCAL_PATH)/../lib/stubs/drm/ LOCAL_MODULE := intel_sprite_on diff --git a/lib/Android.mk b/lib/Android.mk index 003ade5..31f88be 100644 --- a/lib/Android.mk +++ b/lib/Android.mk @@ -17,8 +17,8 @@ LOCAL_GENERATED_SOURCES := \ $(IGT_LIB_PATH)/version.h \ $(GPU_TOOLS_PATH)/config.h -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/.. +LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \ + $(LOCAL_PATH)/stubs/drm/ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) diff --git a/lib/tests/Android.mk b/lib/tests/Android.mk index 026f17f..bbbd4d8 100644 --- a/lib/tests/Android.mk +++ b/lib/tests/Android.mk @@ -30,8 +30,8 @@ IGT_LOCAL_CFLAGS += -std=gnu99 IGT_LOCAL_CFLAGS += -Wno-error=return-type # set local includes -IGT_LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib -IGT_LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm +IGT_LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib \ + $(LOCAL_PATH)/../lib/stubs/drm/ # set local libraries IGT_LOCAL_STATIC_LIBRARIES := libintel_gpu_tools diff --git a/tests/Android.mk b/tests/Android.mk index b664dff..c6e966f 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -40,8 +40,8 @@ IGT_LOCAL_CFLAGS += -Wno-error=return-type IGT_LOCAL_CFLAGS += -Wno-sign-compare # set local includes -IGT_LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib -IGT_LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm +IGT_LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib \ + $(LOCAL_PATH)/../lib/stubs/drm/ # set local libraries IGT_LOCAL_STATIC_LIBRARIES := libintel_gpu_tools diff --git a/tools/Android.mk b/tools/Android.mk index 0bad29c..5653572 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -30,7 +30,7 @@ define add_tool endif LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib - LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm + LOCAL_C_INCLUDES += $(LOCAL_PATH)/../lib/stubs/drm/ LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/zlib LOCAL_MODULE := $1_tool