summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmds/atrace/Android.bp2
-rw-r--r--libs/gui/Android.bp9
-rw-r--r--libs/vr/libbufferhub/Android.bp10
-rw-r--r--libs/vr/libbufferhubqueue/Android.bp4
-rw-r--r--libs/vr/libbufferhubqueue/tests/Android.bp5
-rw-r--r--libs/vr/libdisplay/Android.bp5
-rw-r--r--libs/vr/libdvr/Android.bp5
-rw-r--r--libs/vr/libdvr/tests/Android.bp5
-rw-r--r--libs/vr/libdvrcommon/Android.bp3
-rw-r--r--libs/vr/libpdx_default_transport/Android.bp18
-rw-r--r--libs/vr/libperformance/Android.bp4
-rw-r--r--libs/vr/libvrflinger/Android.bp5
-rw-r--r--libs/vr/libvrsensor/Android.bp5
-rw-r--r--services/surfaceflinger/Android.bp2
-rw-r--r--services/vr/bufferhubd/Android.mk4
-rw-r--r--services/vr/hardware_composer/Android.bp5
-rw-r--r--services/vr/performanced/Android.mk4
17 files changed, 43 insertions, 52 deletions
diff --git a/cmds/atrace/Android.bp b/cmds/atrace/Android.bp
index b850390d93..bb84a18070 100644
--- a/cmds/atrace/Android.bp
+++ b/cmds/atrace/Android.bp
@@ -18,8 +18,6 @@ cc_binary {
"libcutils",
"libz",
"libbase",
- ],
- static_libs: [
"libpdx_default_transport",
],
diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp
index ad04d03624..065d44de40 100644
--- a/libs/gui/Android.bp
+++ b/libs/gui/Android.bp
@@ -120,6 +120,8 @@ cc_library_shared {
shared_libs: [
"libsync",
"libbinder",
+ "libbufferhubqueue", // TODO(b/70046255): Remove this once BufferHub is integrated into libgui.
+ "libpdx_default_transport",
"libcutils",
"libEGL",
"libGLESv2",
@@ -135,13 +137,6 @@ cc_library_shared {
"android.hardware.configstore-utils",
],
- // TODO(b/70046255): Remove these once BufferHub is integrated into libgui.
- static_libs: [
- "libbufferhub",
- "libbufferhubqueue",
- "libpdx_default_transport",
- ],
-
header_libs: [
"libdvr_headers",
"libnativebase_headers",
diff --git a/libs/vr/libbufferhub/Android.bp b/libs/vr/libbufferhub/Android.bp
index 7ea37a7718..39814cc216 100644
--- a/libs/vr/libbufferhub/Android.bp
+++ b/libs/vr/libbufferhub/Android.bp
@@ -22,10 +22,6 @@ localIncludeFiles = [
"include",
]
-staticLibraries = [
- "libpdx_default_transport",
-]
-
sharedLibraries = [
"libbase",
"libbinder",
@@ -34,7 +30,8 @@ sharedLibraries = [
"liblog",
"libui",
"libutils",
- "libnativewindow"
+ "libnativewindow",
+ "libpdx_default_transport",
]
headerLibraries = [
@@ -52,7 +49,6 @@ cc_library {
"-Werror",
],
export_include_dirs: localIncludeFiles,
- static_libs: staticLibraries,
shared_libs: sharedLibraries,
header_libs: headerLibraries,
name: "libbufferhub",
@@ -68,7 +64,7 @@ cc_library {
cc_test {
tags: ["optional"],
srcs: ["buffer_hub-test.cpp"],
- static_libs: ["libbufferhub"] + staticLibraries,
+ static_libs: ["libbufferhub"],
shared_libs: sharedLibraries,
header_libs: headerLibraries,
name: "buffer_hub-test",
diff --git a/libs/vr/libbufferhubqueue/Android.bp b/libs/vr/libbufferhubqueue/Android.bp
index 84e742751a..03cda02c9a 100644
--- a/libs/vr/libbufferhubqueue/Android.bp
+++ b/libs/vr/libbufferhubqueue/Android.bp
@@ -23,7 +23,6 @@ includeFiles = [
staticLibraries = [
"libbufferhub",
- "libpdx_default_transport",
]
sharedLibraries = [
@@ -34,6 +33,7 @@ sharedLibraries = [
"liblog",
"libui",
"libutils",
+ "libpdx_default_transport",
]
headerLibraries = [
@@ -41,7 +41,7 @@ headerLibraries = [
"libnativebase_headers",
]
-cc_library {
+cc_library_shared {
name: "libbufferhubqueue",
cflags: [
"-DLOG_TAG=\"libbufferhubqueue\"",
diff --git a/libs/vr/libbufferhubqueue/tests/Android.bp b/libs/vr/libbufferhubqueue/tests/Android.bp
index 5eba913ac3..de6340a409 100644
--- a/libs/vr/libbufferhubqueue/tests/Android.bp
+++ b/libs/vr/libbufferhubqueue/tests/Android.bp
@@ -6,6 +6,7 @@ header_libraries = [
shared_libraries = [
"libbase",
"libbinder",
+ "libbufferhubqueue",
"libcutils",
"libgui",
"liblog",
@@ -13,14 +14,12 @@ shared_libraries = [
"libui",
"libutils",
"libnativewindow",
+ "libpdx_default_transport",
]
static_libraries = [
- "libbufferhubqueue",
- "libbufferhub",
"libchrome",
"libdvrcommon",
- "libpdx_default_transport",
"libperformance",
]
diff --git a/libs/vr/libdisplay/Android.bp b/libs/vr/libdisplay/Android.bp
index 69dbc84459..192fb5d1f8 100644
--- a/libs/vr/libdisplay/Android.bp
+++ b/libs/vr/libdisplay/Android.bp
@@ -27,6 +27,7 @@ localIncludeFiles = [
sharedLibraries = [
"libbase",
"libbinder",
+ "libbufferhubqueue",
"libcutils",
"liblog",
"libutils",
@@ -35,14 +36,12 @@ sharedLibraries = [
"libhardware",
"libsync",
"libnativewindow",
+ "libpdx_default_transport",
]
staticLibraries = [
"libdvrcommon",
- "libbufferhubqueue",
- "libbufferhub",
"libbroadcastring",
- "libpdx_default_transport",
]
headerLibraries = [
diff --git a/libs/vr/libdvr/Android.bp b/libs/vr/libdvr/Android.bp
index 4f0e561bc2..d0e34eef43 100644
--- a/libs/vr/libdvr/Android.bp
+++ b/libs/vr/libdvr/Android.bp
@@ -44,8 +44,6 @@ srcs = [
static_libs = [
"libbroadcastring",
- "libbufferhub",
- "libbufferhubqueue",
"libvrsensor",
"libdisplay",
"libvirtualtouchpadclient",
@@ -53,13 +51,13 @@ static_libs = [
"libvr_hwc-binder",
"libgrallocusage",
"libperformance",
- "libpdx_default_transport",
]
shared_libs = [
"android.hardware.graphics.bufferqueue@1.0",
"android.hidl.token@1.0-utils",
"libbase",
+ "libbufferhubqueue",
"libbinder",
"liblog",
"libcutils",
@@ -67,6 +65,7 @@ shared_libs = [
"libnativewindow",
"libgui",
"libui",
+ "libpdx_default_transport",
]
cc_library_shared {
diff --git a/libs/vr/libdvr/tests/Android.bp b/libs/vr/libdvr/tests/Android.bp
index 887766a535..e8aa6b7b5e 100644
--- a/libs/vr/libdvr/tests/Android.bp
+++ b/libs/vr/libdvr/tests/Android.bp
@@ -15,6 +15,7 @@
shared_libraries = [
"libbase",
"libbinder",
+ "libbufferhubqueue",
"libcutils",
"libgui",
"liblog",
@@ -22,16 +23,14 @@ shared_libraries = [
"libui",
"libutils",
"libnativewindow",
+ "libpdx_default_transport",
]
static_libraries = [
"libdvr_static",
- "libbufferhubqueue",
- "libbufferhub",
"libchrome",
"libdvrcommon",
"libdisplay",
- "libpdx_default_transport",
"libbroadcastring",
]
diff --git a/libs/vr/libdvrcommon/Android.bp b/libs/vr/libdvrcommon/Android.bp
index c7d808bca0..32b793a905 100644
--- a/libs/vr/libdvrcommon/Android.bp
+++ b/libs/vr/libdvrcommon/Android.bp
@@ -26,9 +26,10 @@ sharedLibraries = [
"libui",
"libgui",
"libhardware",
+ "libpdx_default_transport",
]
-staticLibraries = ["libpdx_default_transport", "libbroadcastring"]
+staticLibraries = ["libbroadcastring"]
headerLibraries = [
"libeigen",
diff --git a/libs/vr/libpdx_default_transport/Android.bp b/libs/vr/libpdx_default_transport/Android.bp
index 779e3a1e4b..475eb50f29 100644
--- a/libs/vr/libpdx_default_transport/Android.bp
+++ b/libs/vr/libpdx_default_transport/Android.bp
@@ -30,13 +30,25 @@ cc_defaults {
whole_static_libs: ["libpdx_uds"],
}
-cc_library_static {
+cc_library_shared {
name: "libpdx_default_transport",
defaults: [
"pdx_default_transport_compiler_defaults",
"pdx_default_transport_lib_defaults",
"pdx_use_transport_uds",
],
+ vendor_available: false,
+ vndk: {
+ enabled: true,
+ },
+ shared_libs: [
+ "libbase",
+ "libbinder",
+ "libcutils",
+ "liblog",
+ "libutils",
+ "libcrypto",
+ ],
}
cc_binary {
@@ -49,8 +61,6 @@ cc_binary {
"libbinder",
"libcutils",
"liblog",
- ],
- static_libs: [
"libpdx_default_transport",
],
}
@@ -69,8 +79,6 @@ cc_binary {
"libcutils",
"liblog",
"libutils",
- ],
- static_libs: [
"libpdx_default_transport",
],
}
diff --git a/libs/vr/libperformance/Android.bp b/libs/vr/libperformance/Android.bp
index 7c32dbbf7a..35d3dea9de 100644
--- a/libs/vr/libperformance/Android.bp
+++ b/libs/vr/libperformance/Android.bp
@@ -19,14 +19,13 @@ sourceFiles = [
includeFiles = [ "include" ]
-staticLibraries = ["libpdx_default_transport"]
-
sharedLibraries = [
"libbase",
"libbinder",
"libcutils",
"liblog",
"libutils",
+ "libpdx_default_transport",
]
cc_library {
@@ -38,7 +37,6 @@ cc_library {
"-Werror",
],
export_include_dirs: includeFiles,
- static_libs: staticLibraries,
shared_libs: sharedLibraries,
name: "libperformance",
}
diff --git a/libs/vr/libvrflinger/Android.bp b/libs/vr/libvrflinger/Android.bp
index 9b6f0c5ccb..23a9853ce2 100644
--- a/libs/vr/libvrflinger/Android.bp
+++ b/libs/vr/libvrflinger/Android.bp
@@ -26,14 +26,11 @@ sourceFiles = [
includeFiles = [ "include" ]
staticLibraries = [
- "libbufferhub",
- "libbufferhubqueue",
"libdisplay",
"libdvrcommon",
"libperformance",
"libvrsensor",
"libbroadcastring",
- "libpdx_default_transport",
"libvr_manager",
"libbroadcastring",
]
@@ -44,6 +41,7 @@ sharedLibraries = [
"android.hardware.graphics.composer@2.1",
"libbinder",
"libbase",
+ "libbufferhubqueue",
"libcutils",
"liblog",
"libhardware",
@@ -59,6 +57,7 @@ sharedLibraries = [
"libhidlbase",
"libhidltransport",
"libfmq",
+ "libpdx_default_transport",
]
headerLibraries = [
diff --git a/libs/vr/libvrsensor/Android.bp b/libs/vr/libvrsensor/Android.bp
index fe54b4bb0c..85427906f1 100644
--- a/libs/vr/libvrsensor/Android.bp
+++ b/libs/vr/libvrsensor/Android.bp
@@ -23,21 +23,20 @@ includeFiles = [
staticLibraries = [
"libdisplay",
- "libbufferhub",
- "libbufferhubqueue",
"libdvrcommon",
"libbroadcastring",
- "libpdx_default_transport",
]
sharedLibraries = [
"libbase",
"libbinder",
+ "libbufferhubqueue",
"libcutils",
"libhardware",
"liblog",
"libutils",
"libui",
+ "libpdx_default_transport",
]
cc_library {
diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp
index 9f3189a39c..08ec26bf58 100644
--- a/services/surfaceflinger/Android.bp
+++ b/services/surfaceflinger/Android.bp
@@ -26,6 +26,7 @@ cc_defaults {
"android.hardware.power@1.0",
"libbase",
"libbinder",
+ "libbufferhubqueue",
"libcutils",
"libdl",
"libEGL",
@@ -39,6 +40,7 @@ cc_defaults {
"libhwbinder",
"liblayers_proto",
"liblog",
+ "libpdx_default_transport",
"libprotobuf-cpp-lite",
"libsync",
"libui",
diff --git a/services/vr/bufferhubd/Android.mk b/services/vr/bufferhubd/Android.mk
index e1997d74e1..1a99cf4641 100644
--- a/services/vr/bufferhubd/Android.mk
+++ b/services/vr/bufferhubd/Android.mk
@@ -27,7 +27,6 @@ headerLibraries := \
staticLibraries := \
libperformance \
- libpdx_default_transport \
libbufferhub
sharedLibraries := \
@@ -38,7 +37,8 @@ sharedLibraries := \
libsync \
libutils \
libgui \
- libui
+ libui \
+ libpdx_default_transport \
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(sourceFiles)
diff --git a/services/vr/hardware_composer/Android.bp b/services/vr/hardware_composer/Android.bp
index 063d83c591..caf9049712 100644
--- a/services/vr/hardware_composer/Android.bp
+++ b/services/vr/hardware_composer/Android.bp
@@ -10,9 +10,6 @@ cc_library_shared {
"libbroadcastring",
"libhwcomposer-client",
"libdisplay",
- "libbufferhubqueue",
- "libbufferhub",
- "libpdx_default_transport",
],
shared_libs: [
@@ -20,6 +17,7 @@ cc_library_shared {
"android.hardware.graphics.composer@2.1",
"android.hardware.graphics.mapper@2.0",
"libbase",
+ "libbufferhubqueue",
"libbinder",
"libcutils",
"libfmq",
@@ -30,6 +28,7 @@ cc_library_shared {
"libsync",
"libui",
"libutils",
+ "libpdx_default_transport",
],
header_libs: [
diff --git a/services/vr/performanced/Android.mk b/services/vr/performanced/Android.mk
index 1470234e9e..a548ef0fac 100644
--- a/services/vr/performanced/Android.mk
+++ b/services/vr/performanced/Android.mk
@@ -22,7 +22,6 @@ sourceFiles := \
staticLibraries := \
libperformance \
- libpdx_default_transport \
libvr_manager
sharedLibraries := \
@@ -30,7 +29,8 @@ sharedLibraries := \
libbase \
libcutils \
liblog \
- libutils
+ libutils \
+ libpdx_default_transport \
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(sourceFiles)
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-12-27 08:05:48 +0000