Skip to content

Commit 5d4a64f

Browse files
xaionaro@dx.centerxaionaro@dx.center
authored andcommitted
chore: regenerate after gralloc bridge removal
1 parent 8c9b752 commit 5d4a64f

13 files changed

Lines changed: 521 additions & 389 deletions

File tree

Makefile

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -84,32 +84,6 @@ e2e:
8484
e2e-bindercli:
8585
go test -tags e2e ./tests/e2e/... -run TestBindercli -v -timeout 300s
8686

87-
# Build gralloc bridge shared library for x86_64 Android using NDK.
88-
# Requires stub libs (libhidlbase.so, libmapper3.so, libutils.so, libcutils.so)
89-
# to be pulled from the emulator into /tmp first:
90-
# adb pull /system/lib64/libhidlbase.so /tmp/
91-
# adb pull /system/lib64/libutils.so /tmp/
92-
# adb pull /system/lib64/libcutils.so /tmp/
93-
# (libmapper3.so is a thin wrapper — pull or build separately)
94-
gralloc-bridge:
95-
@mkdir -p build
96-
$(NDK_CC) -shared -fPIC -o build/gralloc_bridge.so gralloc/bridge/native/gralloc_bridge.cpp \
97-
-I$(GRAPHENEOS)/system/libhidl/transport/include \
98-
-I$(GRAPHENEOS)/system/libhidl/base/include \
99-
-I$(GRAPHENEOS)/system/core/libcutils/include \
100-
-I$(GRAPHENEOS)/system/core/libutils/include \
101-
-I$(GRAPHENEOS)/system/core/libsystem/include \
102-
-I$(GRAPHENEOS)/system/libfmq/base \
103-
-I$(HIDL_GEN)/hardware/interfaces/graphics/mapper/3.0/android.hardware.graphics.mapper@3.0_genc++_headers/gen \
104-
-I$(HIDL_GEN)/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen \
105-
-I$(HIDL_GEN)/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen \
106-
-I$(HIDL_GEN)/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen \
107-
-I$(HIDL_GEN)/hardware/interfaces/graphics/mapper/2.0/android.hardware.graphics.mapper@2.0_genc++_headers/gen \
108-
-I$(HIDL_GEN)/hardware/interfaces/graphics/mapper/2.1/android.hardware.graphics.mapper@2.1_genc++_headers/gen \
109-
-I$(HIDL_GEN)/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen \
110-
-I$(HIDL_GEN)/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen \
111-
-L/tmp -lhidlbase -lmapper3 -lutils -lcutils -std=c++17 -static-libstdc++
112-
11387
# --- Build ---
11488

11589
# Run go vet on all packages.

camera/device.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func (d *Device) CaptureFrame(
191191
if buf == nil {
192192
return nil, fmt.Errorf("slot %d: buffer not assigned (dequeue may not have been called for this slot)", slot)
193193
}
194-
return buf.ReadPixels()
194+
return buf.ReadPixels(ctx)
195195
}
196196
}
197197

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ require (
1818
github.com/buger/jsonparser v1.1.1 // indirect
1919
github.com/cyphar/filepath-securejoin v0.5.1 // indirect
2020
github.com/davecgh/go-spew v1.1.1 // indirect
21-
github.com/ebitengine/purego v0.10.0 // indirect
2221
github.com/go-ng/slices v0.0.0-20230703171042-6195d35636a2 // indirect
2322
github.com/go-ng/sort v0.0.0-20220617173827-2cc7cd04f7c7 // indirect
2423
github.com/go-ng/xatomic v0.0.0-20230519181013-85c0ec87e55f // indirect

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ github.com/cyphar/filepath-securejoin v0.5.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGL
1010
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1111
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1212
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
13-
github.com/ebitengine/purego v0.10.0 h1:QIw4xfpWT6GWTzaW5XEKy3HXoqrJGx1ijYHzTF0/ISU=
14-
github.com/ebitengine/purego v0.10.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
1513
github.com/electricbubble/gadb v0.1.0 h1:h7RKlToMlFtGW4rUkAd4GSiFAHioMH5Nx7jtbb2nKi4=
1614
github.com/electricbubble/gadb v0.1.0/go.mod h1:3293YJ6OWHv/Q6NA5dwSbK43MbmYm8+Vz2d7h5J3IA8=
1715
github.com/facebookincubator/go-belt v0.0.0-20250308011339-62fb7027b11f h1:MlG3PjCUpnbPN0JVX8UFu2Qherr6VzWqXo4GYF3J5nI=

gralloc/bridge/ffi.go

Lines changed: 0 additions & 151 deletions
This file was deleted.

gralloc/bridge/native/gralloc_bridge.cpp

Lines changed: 0 additions & 143 deletions
This file was deleted.

gralloc/bridge_mapper.go

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)