From patchwork Tue Jul 5 20:21:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 9215177 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 069786048B for ; Tue, 5 Jul 2016 20:21:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EAA20283E3 for ; Tue, 5 Jul 2016 20:21:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCBE82840C; Tue, 5 Jul 2016 20:21:29 +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]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCFAE283E3 for ; Tue, 5 Jul 2016 20:21:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 466136E03C; Tue, 5 Jul 2016 20:21:24 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yw0-f193.google.com (mail-yw0-f193.google.com [209.85.161.193]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0647B6E03C for ; Tue, 5 Jul 2016 20:21:22 +0000 (UTC) Received: by mail-yw0-f193.google.com with SMTP id v77so9233426ywg.2 for ; Tue, 05 Jul 2016 13:21:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=pnq+N0nObniG0jlT00pWcq+vhtvSfExHqQk4KHJcpH8=; b=QiR2PhEJsDAaCwyKXhqiCO0Tfg3ko0OV56SW813QxMd7RBC7A/WwKSgyQvYnTDW+kt qPucSnhuxDRNn55rBjtwFI6mJJ+7eGSNuH973pDRD51MwrIKiFkFRmMTh95l+XPZSizl opM14cR6CkTI0wqu6bpnaWEiXw+5pOFmyFCj7gYc7assA+LldNvOiaf7C5YyfamY3ycq WIxZv/EgsyxHNYcXaZVT0Of7XYeHIPKJpP43muxy3EL1czQuhhgK2TDwIWdZUlS1zAHQ NW1yOkTw9qYIqiGjjma+/qigU5Q8oiyAHdLjLScajtr+esAQe4l8GmlCPhedOP6bHdAd DtUQ== X-Gm-Message-State: ALyK8tKrc3rhhqcgMN4OIBQkcTDCyYrbOIJ5zM+H+DfTBPk2oQeyoSuPEhe3d2AMJsTvXA== X-Received: by 10.37.115.215 with SMTP id o206mr9637215ybc.48.1467750081007; Tue, 05 Jul 2016 13:21:21 -0700 (PDT) Received: from localhost.localdomain ([70.45.179.37]) by smtp.googlemail.com with ESMTPSA id i81sm5552170ywi.13.2016.07.05.13.21.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Jul 2016 13:21:20 -0700 (PDT) From: Rob Herring To: dri-devel@lists.freedesktop.org Subject: [PATCH] Android: strip out header files from sources list Date: Tue, 5 Jul 2016 15:21:18 -0500 Message-Id: <20160705202118.28269-1-robh@kernel.org> X-Mailer: git-send-email 2.9.0 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-Virus-Scanned: ClamAV using ClamSMTP AOSP master now errors if LOCAL_SRC_FILES contains headers, so filter out header files from the source lists. Signed-off-by: Rob Herring --- Android.mk | 4 ++-- amdgpu/Android.mk | 2 +- freedreno/Android.mk | 2 +- intel/Android.mk | 2 +- libkms/Android.mk | 2 +- nouveau/Android.mk | 2 +- radeon/Android.mk | 2 +- tests/modetest/Android.mk | 2 +- tests/proptest/Android.mk | 2 +- tests/util/Android.mk | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Android.mk b/Android.mk index 1d8cd65..2aa2bc9 100644 --- a/Android.mk +++ b/Android.mk @@ -32,7 +32,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libdrm LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(LIBDRM_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_FILES)) LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/include/drm @@ -50,7 +50,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libdrm LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(LIBDRM_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_FILES)) LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/include/drm diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk index 469df1b..57c53a7 100644 --- a/amdgpu/Android.mk +++ b/amdgpu/Android.mk @@ -9,7 +9,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdrm -LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_AMDGPU_FILES)) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_CFLAGS := \ diff --git a/freedreno/Android.mk b/freedreno/Android.mk index 2645f73..fba48f2 100644 --- a/freedreno/Android.mk +++ b/freedreno/Android.mk @@ -9,7 +9,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdrm -LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_FREEDRENO_FILES)) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_CFLAGS := \ diff --git a/intel/Android.mk b/intel/Android.mk index 6582dfd..838a93b 100644 --- a/intel/Android.mk +++ b/intel/Android.mk @@ -30,7 +30,7 @@ include $(LOCAL_PATH)/Makefile.sources LOCAL_MODULE := libdrm_intel LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_INTEL_FILES)) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_CFLAGS := \ diff --git a/libkms/Android.mk b/libkms/Android.mk index a406782..cf0e9bb 100644 --- a/libkms/Android.mk +++ b/libkms/Android.mk @@ -26,7 +26,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) include $(LOCAL_PATH)/Makefile.sources -LOCAL_SRC_FILES := $(LIBKMS_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBKMS_FILES)) ifneq ($(filter $(vmwgfx_drivers), $(DRM_GPU_DRIVERS)),) LOCAL_SRC_FILES += $(LIBKMS_VMWGFX_FILES) diff --git a/nouveau/Android.mk b/nouveau/Android.mk index abc6aef..b67d30f 100644 --- a/nouveau/Android.mk +++ b/nouveau/Android.mk @@ -9,7 +9,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdrm -LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_NOUVEAU_FILES)) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_CFLAGS := \ diff --git a/radeon/Android.mk b/radeon/Android.mk index ace3408..e704443 100644 --- a/radeon/Android.mk +++ b/radeon/Android.mk @@ -9,7 +9,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdrm -LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(LIBDRM_RADEON_FILES)) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_CFLAGS := \ diff --git a/tests/modetest/Android.mk b/tests/modetest/Android.mk index e616558..6a7f406 100644 --- a/tests/modetest/Android.mk +++ b/tests/modetest/Android.mk @@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) include $(LOCAL_PATH)/Makefile.sources -LOCAL_SRC_FILES := $(MODETEST_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(MODETEST_FILES)) LOCAL_MODULE := modetest diff --git a/tests/proptest/Android.mk b/tests/proptest/Android.mk index d0ab5c9..badeb58 100644 --- a/tests/proptest/Android.mk +++ b/tests/proptest/Android.mk @@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) include $(LOCAL_PATH)/Makefile.sources -LOCAL_SRC_FILES := $(PROPTEST_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(PROPTEST_FILES)) LOCAL_MODULE := proptest diff --git a/tests/util/Android.mk b/tests/util/Android.mk index 73bc680..1bd82ae 100644 --- a/tests/util/Android.mk +++ b/tests/util/Android.mk @@ -31,7 +31,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdrm -LOCAL_SRC_FILES := $(UTIL_FILES) +LOCAL_SRC_FILES := $(patsubst %.h, , $(UTIL_FILES)) # avoid name clashes by requiring users to include util/*.h LOCAL_EXPORT_C_INCLUDE_DIRS := $(dir $(LOCAL_PATH))