lineage-rockchip/android_external_minigbm
1
0
Fork 0
Code Activity Actions

Adds Android.bp files back after merge.

Browse source 
I removed the Android.bp files from upstream as they seemed
to get out of sync quickly. Let's just keep them in Android
repos.

Bug: b/161909468
Test: launch_cvd
Merged-In: I27f020b4f661890bcc2817deb09ffb9af1c76f1b
Change-Id: Id5222980cc2e7c284a846259c808bf79cf5f2a75
This commit is contained in:
Jason Macnak 2020-09-18 09:11:12 -07:00
parent 910da248a7
commit 1e4aff7321
3 changed files with 168 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Android.bp
View file

@ -1,8 +1,5 @@
/*
* Copyright 2020 The Chromium OS Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
cc_defaults {
name: "minigbm_defaults",
@ -44,7 +41,7 @@ cc_defaults {
}
cc_defaults {
name: "minigbm_gralloc_defaults",
name: "minigbm_cros_gralloc_defaults",
defaults: ["minigbm_defaults"],
@ -81,8 +78,6 @@ cc_defaults {
"libsync",
"liblog",
],
relative_install_path: "hw",
}
cc_defaults {
@ -121,8 +116,8 @@ cc_library {
}
cc_library_static {
name: "libminigbm_gralloc",
defaults: ["minigbm_gralloc_defaults"],
name: "libminigbm_cros_gralloc",
defaults: ["minigbm_cros_gralloc_defaults"],
shared_libs: ["liblog"],
static_libs: ["libdrm"],
@ -131,13 +126,13 @@ cc_library_static {
cc_library_shared {
name: "gralloc.minigbm",
defaults: ["minigbm_gralloc_defaults"],
defaults: ["minigbm_cros_gralloc_defaults"],
srcs: ["cros_gralloc/gralloc0/gralloc0.cc"],
}
cc_library_shared {
name: "gralloc.minigbm_intel",
defaults: ["minigbm_gralloc_defaults"],
defaults: ["minigbm_cros_gralloc_defaults"],
enabled: false,
arch: {
x86: {
@ -153,7 +148,7 @@ cc_library_shared {
cc_library_shared {
name: "gralloc.minigbm_meson",
defaults: ["minigbm_gralloc_defaults"],
defaults: ["minigbm_cros_gralloc_defaults"],
cflags: ["-DDRV_MESON"],
srcs: ["cros_gralloc/gralloc0/gralloc0.cc"],
}