Merge "[Cleanup] Properly export lib headers."

This commit is contained in:
TreeHugger Robot
2019-07-03 03:48:14 +00:00
committed by Android (Google) Code Review
7 changed files with 35 additions and 34 deletions

View File

@@ -28,9 +28,18 @@ cc_library_static {
"android.hardware.graphics.mapper@2.0-vts",
"android.hardware.graphics.mapper@3.0-vts",
],
export_static_lib_headers: [
"VtsHalHidlTargetTestBase",
"android.hardware.graphics.composer@2.1",
"android.hardware.graphics.mapper@2.0-vts",
"android.hardware.graphics.mapper@3.0-vts",
],
header_libs: [
"android.hardware.graphics.composer@2.1-command-buffer",
],
export_header_lib_headers: [
"android.hardware.graphics.composer@2.1-command-buffer",
],
cflags: [
"-O0",
"-g",

View File

@@ -3,7 +3,3 @@ courtneygo@google.com
lpy@google.com
stoza@google.com
vhau@google.com
# VTS team
yim@google.com
zhuoyao@google.com

View File

@@ -3,11 +3,16 @@ cc_library_headers {
defaults: ["hidl_defaults"],
vendor_available: true,
shared_libs: [
"android.hardware.graphics.composer@2.1",
"android.hardware.graphics.composer@2.2",
],
export_shared_lib_headers: [
"android.hardware.graphics.composer@2.2",
],
header_libs: [
"android.hardware.graphics.composer@2.1-command-buffer",
],
export_header_lib_headers: [
"android.hardware.graphics.composer@2.1-command-buffer",
],
export_include_dirs: ["include"],
}

View File

@@ -26,28 +26,25 @@ cc_library_static {
"libui",
],
static_libs: [
"librenderengine",
"libmath",
"libarect",
"libnativewindow",
"VtsHalHidlTargetTestBase",
"android.hardware.graphics.composer@2.1",
"android.hardware.graphics.composer@2.1-vts",
"android.hardware.graphics.composer@2.2",
"android.hardware.graphics.mapper@2.1",
"android.hardware.graphics.mapper@2.1-vts",
"android.hardware.graphics.mapper@3.0",
"android.hardware.graphics.mapper@3.0-vts",
"libarect",
"libmath",
"libnativewindow",
"librenderengine",
],
export_static_lib_headers: [
"VtsHalHidlTargetTestBase",
"android.hardware.graphics.composer@2.1-vts",
"android.hardware.graphics.composer@2.2",
"android.hardware.graphics.mapper@2.1-vts",
],
header_libs: [
"android.hardware.graphics.composer@2.1-command-buffer",
"android.hardware.graphics.composer@2.2-command-buffer",
],
export_header_lib_headers: [
"android.hardware.graphics.composer@2.1-command-buffer",
"android.hardware.graphics.composer@2.2-command-buffer",
],
cflags: [

View File

@@ -2,7 +2,3 @@
lpy@google.com
stoza@google.com
vhau@google.com
# VTS team
yim@google.com
zhuoyao@google.com

View File

@@ -3,12 +3,15 @@ cc_library_headers {
defaults: ["hidl_defaults"],
vendor_available: true,
shared_libs: [
"android.hardware.graphics.composer@2.1",
"android.hardware.graphics.composer@2.2",
"android.hardware.graphics.composer@2.3",
],
export_shared_lib_headers: [
"android.hardware.graphics.composer@2.3",
],
header_libs: [
"android.hardware.graphics.composer@2.1-command-buffer",
"android.hardware.graphics.composer@2.2-command-buffer",
],
export_header_lib_headers: [
"android.hardware.graphics.composer@2.2-command-buffer",
],
export_include_dirs: ["include"],

View File

@@ -21,22 +21,17 @@ cc_library_static {
"ComposerVts.cpp",
],
static_libs: [
"VtsHalHidlTargetTestBase",
"android.hardware.graphics.composer@2.1",
"android.hardware.graphics.composer@2.1-vts",
"android.hardware.graphics.composer@2.2",
"android.hardware.graphics.composer@2.2-vts",
"android.hardware.graphics.composer@2.3",
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.mapper@2.0-vts",
"android.hardware.graphics.mapper@2.1",
"android.hardware.graphics.mapper@2.1-vts",
"android.hardware.graphics.mapper@3.0",
"android.hardware.graphics.mapper@3.0-vts",
],
export_static_lib_headers: [
"android.hardware.graphics.composer@2.2-vts",
"android.hardware.graphics.composer@2.3",
],
header_libs: [
"android.hardware.graphics.composer@2.1-command-buffer",
"android.hardware.graphics.composer@2.2-command-buffer",
"android.hardware.graphics.composer@2.3-command-buffer",
],
export_header_lib_headers: [
"android.hardware.graphics.composer@2.3-command-buffer",
],
cflags: [