Add a library to wrap libfiemap differences between recovery and normal AOSP.

libsnapshot has to work both in normal boot and in recovery. Normally,
we want libfiemap to be used through gsid, via binder, to consolidate the
necessary SELinux permissions. However binder is not available in
recovery, so instead we introduce a compile-time abstraction layer.

Recovery should link to libfiemap; otherwise, libfiemap_binder
should be used instead. They both present the same API.

Bug: 134536978
Test: manual test
Change-Id: I60370af2175723141e61f0ee301cad40d2f331c1

1 files changed, 3 insertions, 3 deletions

diff --git a/gsi_service.h b/gsi_service.h
index 6d72921..30ec2d7 100644
--- a/gsi_service.h
+++ b/gsi_service.h
@@ -44,7 +44,7 @@ class Gsid : public BinderService<Gsid>, public BnGsid {
 
   private:
     friend class GsiService;
-    friend class ImageManagerService;
+    friend class ImageService;
 
     std::mutex& lock() { return lock_; }
 
@@ -77,8 +77,8 @@ class GsiService : public BinderService<GsiService>, public BnGsiService {
     binder::Status getGsiBootStatus(int* _aidl_return) override;
     binder::Status getInstalledGsiImageDir(std::string* _aidl_return) override;
     binder::Status wipeGsiUserdata(int* _aidl_return) override;
-    binder::Status openImageManager(const std::string& prefix,
-                                    android::sp<IImageManager>* _aidl_return) override;
+    binder::Status openImageService(const std::string& prefix,
+                                    android::sp<IImageService>* _aidl_return) override;
 
     // This is in GsiService, rather than GsiInstaller, since we need to access
     // it outside of the main lock which protects the unique_ptr.