From patchwork Tue Sep 19 21:59:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 9960385 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 A4D30601E9 for ; Tue, 19 Sep 2017 22:00:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8BA6A28F0E for ; Tue, 19 Sep 2017 22:00:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 807EB28F0D; Tue, 19 Sep 2017 22:00:16 +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 D2B1928F0E for ; Tue, 19 Sep 2017 22:00:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D7F496E66F; Tue, 19 Sep 2017 22:00:07 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-oi0-f68.google.com (mail-oi0-f68.google.com [209.85.218.68]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5678F6E66F for ; Tue, 19 Sep 2017 22:00:06 +0000 (UTC) Received: by mail-oi0-f68.google.com with SMTP id v188so16228oia.1 for ; Tue, 19 Sep 2017 15:00:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=OD2PEZ9C4cwjiWgBE9LHh48h01lwvRgUhw0B+Z5wblU=; b=jVyQkjBaONMmyPGFiV55ZqNZ3Mbud2VxmsqwBGUC1sJoMub+FIZAw38P28NML/ojaN hu5NbssdyYwuoOxbKuL+9dQjpDyWJkxj+NENHRGaxgFlS6p0rqa8hBmX6TEtIwSgFlsf nioQJNmXO/p7ck6yabimVEdT8SvFPo3gFdeF9LEeaWH1U7cNSmUwSive0WZQFPm8CTgC Y/+x1Nwu4GzteGmBOL1I7FALYjzaoPioI/DHxylXM7IItQzgzSnD2YfwRLDrTLV1nljL 0gJyuITiFe3aq0WeTOxAAFj8q9qTeK8tu4XqxDDBWETQuivb4JJlGk/3tHseaOfDvRNV aHXQ== X-Gm-Message-State: AHPjjUg7SGoTOvhjXCaVA6UD9oSDkxvRUrmJF5RI17n1EWcOeKHKzlSp esgc2j5Y1Pf0T9K1D9dan5TecRQ= X-Google-Smtp-Source: AOwi7QCLWdgJtCAaC6TYR6ZN636ieEV6XUKlEj3DWuYKkzwG2s/75SEvZLvOi4L+kQCYjM701s+E9Q== X-Received: by 10.202.245.81 with SMTP id t78mr3029106oih.227.1505858405242; Tue, 19 Sep 2017 15:00:05 -0700 (PDT) Received: from localhost.localdomain (216-188-254-6.dyn.grandenetworks.net. [216.188.254.6]) by smtp.googlemail.com with ESMTPSA id e38sm809727oth.80.2017.09.19.15.00.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Sep 2017 15:00:04 -0700 (PDT) From: Rob Herring To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm] Android: move libraries to /vendor Date: Tue, 19 Sep 2017 16:59:59 -0500 Message-Id: <20170919215959.19650-1-robh@kernel.org> X-Mailer: git-send-email 2.11.0 Cc: Mauro Rossi 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 As part of Treble project in Android O, all the device specific files have to be located in a separate vendor partition. This is done by setting LOCAL_PROPRIETARY_MODULE (the name is misleading). This change will not break existing platforms without a vendor partition as it will just move files to /system/vendor. Signed-off-by: Rob Herring Reviewed-by: Sean Paul --- Android.mk | 1 + amdgpu/Android.mk | 3 ++- data/Android.mk | 3 ++- etnaviv/Android.mk | 1 + freedreno/Android.mk | 1 + intel/Android.mk | 1 + nouveau/Android.mk | 1 + radeon/Android.mk | 1 + tests/modetest/Android.mk | 1 + tests/proptest/Android.mk | 1 + 10 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 292be2360263..8b2abba89ba1 100644 --- a/Android.mk +++ b/Android.mk @@ -49,6 +49,7 @@ include $(BUILD_STATIC_LIBRARY) # Shared library for the device include $(CLEAR_VARS) LOCAL_MODULE := libdrm +LOCAL_PROPRIETARY_MODULE := true LOCAL_SRC_FILES := $(LIBDRM_FILES) LOCAL_EXPORT_C_INCLUDE_DIRS := \ diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk index 88d376511730..3a897f01c1fa 100644 --- a/amdgpu/Android.mk +++ b/amdgpu/Android.mk @@ -5,13 +5,14 @@ include $(CLEAR_VARS) include $(LOCAL_PATH)/Makefile.sources LOCAL_MODULE := libdrm_amdgpu +LOCAL_PROPRIETARY_MODULE := true LOCAL_SHARED_LIBRARIES := libdrm LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES) LOCAL_CFLAGS := \ - -DAMDGPU_ASIC_ID_TABLE=\"/system/etc/hwdata/amdgpu.ids\" \ + -DAMDGPU_ASIC_ID_TABLE=\"/vendor/etc/hwdata/amdgpu.ids\" \ -DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' $(LIBDRM_TOP)/data/amdgpu.ids) LOCAL_REQUIRED_MODULES := amdgpu.ids diff --git a/data/Android.mk b/data/Android.mk index 3c1fd7c62fb9..62013f0cb46b 100644 --- a/data/Android.mk +++ b/data/Android.mk @@ -4,6 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := amdgpu.ids LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/hwdata +LOCAL_PROPRIETARY_MODULE := true +LOCAL_MODULE_RELATIVE_PATH := hwdata LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) diff --git a/etnaviv/Android.mk b/etnaviv/Android.mk index 390f9a98924d..9b32deb833a1 100644 --- a/etnaviv/Android.mk +++ b/etnaviv/Android.mk @@ -5,6 +5,7 @@ include $(CLEAR_VARS) include $(LOCAL_PATH)/Makefile.sources LOCAL_MODULE := libdrm_etnaviv +LOCAL_PROPRIETARY_MODULE := true LOCAL_SHARED_LIBRARIES := libdrm diff --git a/freedreno/Android.mk b/freedreno/Android.mk index 2b582aeded74..c31101c9b99b 100644 --- a/freedreno/Android.mk +++ b/freedreno/Android.mk @@ -5,6 +5,7 @@ include $(CLEAR_VARS) include $(LOCAL_PATH)/Makefile.sources LOCAL_MODULE := libdrm_freedreno +LOCAL_PROPRIETARY_MODULE := true LOCAL_SHARED_LIBRARIES := libdrm diff --git a/intel/Android.mk b/intel/Android.mk index 5407ff3ed208..457eafe199f2 100644 --- a/intel/Android.mk +++ b/intel/Android.mk @@ -28,6 +28,7 @@ include $(CLEAR_VARS) include $(LOCAL_PATH)/Makefile.sources LOCAL_MODULE := libdrm_intel +LOCAL_PROPRIETARY_MODULE := true LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES) diff --git a/nouveau/Android.mk b/nouveau/Android.mk index b430af4fdd70..f58386fcb976 100644 --- a/nouveau/Android.mk +++ b/nouveau/Android.mk @@ -5,6 +5,7 @@ include $(CLEAR_VARS) include $(LOCAL_PATH)/Makefile.sources LOCAL_MODULE := libdrm_nouveau +LOCAL_PROPRIETARY_MODULE := true LOCAL_SHARED_LIBRARIES := libdrm diff --git a/radeon/Android.mk b/radeon/Android.mk index 71040dab79b8..b770728e67c6 100644 --- a/radeon/Android.mk +++ b/radeon/Android.mk @@ -5,6 +5,7 @@ include $(CLEAR_VARS) include $(LOCAL_PATH)/Makefile.sources LOCAL_MODULE := libdrm_radeon +LOCAL_PROPRIETARY_MODULE := true LOCAL_SHARED_LIBRARIES := libdrm diff --git a/tests/modetest/Android.mk b/tests/modetest/Android.mk index c1a71fd9702a..80c806afd765 100644 --- a/tests/modetest/Android.mk +++ b/tests/modetest/Android.mk @@ -6,6 +6,7 @@ include $(LOCAL_PATH)/Makefile.sources LOCAL_SRC_FILES := $(MODETEST_FILES) LOCAL_MODULE := modetest +LOCAL_PROPRIETARY_MODULE := true LOCAL_SHARED_LIBRARIES := libdrm LOCAL_STATIC_LIBRARIES := libdrm_util diff --git a/tests/proptest/Android.mk b/tests/proptest/Android.mk index 91a590fc9fca..b6e1f5ef1fb5 100644 --- a/tests/proptest/Android.mk +++ b/tests/proptest/Android.mk @@ -6,6 +6,7 @@ include $(LOCAL_PATH)/Makefile.sources LOCAL_SRC_FILES := $(PROPTEST_FILES) LOCAL_MODULE := proptest +LOCAL_PROPRIETARY_MODULE := true LOCAL_SHARED_LIBRARIES := libdrm LOCAL_STATIC_LIBRARIES := libdrm_util