diff options
| author | Kiyoung Kim <kiyoungkim@google.com> | 2023-08-29 05:48:57 +0000 |
|---|---|---|
| committer | Kiyoung Kim <kiyoungkim@google.com> | 2023-08-29 05:52:44 +0000 |
| commit | 0ffdf24b439b91e103b76c1b6109387a0d59a244 (patch) | |
| tree | bfd7d82586b16d4432b789307a2440253504c8eb | |
| parent | 7a8da42905962d002f110d3fd75920ab606557fa (diff) | |
| parent | 5f5589fe909e5d94469f22f1265763e0503f7fb1 (diff) | |
| download | camera-0ffdf24b439b91e103b76c1b6109387a0d59a244.tar.gz | |
[conflict] Remove dependency with libbinder am: 5f5589fe90
Original change: https://android-review.googlesource.com/c/platform/hardware/google/camera/+/2674955
Change-Id: I543a3a222677cdd3a29ba333552d729a35a56ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | common/hal/aidl_service/Android.bp | 1 | ||||
| -rw-r--r-- | common/hal/aidl_service/aidl_service.cc | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/common/hal/aidl_service/Android.bp b/common/hal/aidl_service/Android.bp index 179a826..3493961 100644 --- a/common/hal/aidl_service/Android.bp +++ b/common/hal/aidl_service/Android.bp @@ -99,7 +99,6 @@ cc_defaults { "android.hardware.thermal@1.0", "android.hardware.thermal@2.0", "android.hardware.thermal-V1-ndk", - "libbinder", "libbinder_ndk", "libbase", "libcamera_metadata", diff --git a/common/hal/aidl_service/aidl_service.cc b/common/hal/aidl_service/aidl_service.cc index a98753a..2739f46 100644 --- a/common/hal/aidl_service/aidl_service.cc +++ b/common/hal/aidl_service/aidl_service.cc @@ -24,7 +24,6 @@ #include <android/binder_manager.h> #include <android/binder_process.h> #include <apex_update_listener.h> -#include <binder/ProcessState.h> #include <cutils/properties.h> #include <hidl/HidlTransportSupport.h> #include <malloc.h> @@ -49,10 +48,7 @@ const std::string kProviderInstance = "/internal/0"; int main() { ALOGI("Google camera provider service is starting."); - // The camera HAL may communicate to other vendor components via - // /dev/vndbinder mallopt(M_DECAY_TIME, 1); - android::ProcessState::initWithDriver("/dev/vndbinder"); android::hardware::configureRpcThreadpool(/*maxThreads=*/6, /*callerWillJoin=*/true); |