Hidlized version of IMemory.
- Add hidl_memory type.
- Add android.hidl.memory@1.0 package
- IMapper
- IAllocator
- IMemory
- Add libhidlmemory
- Add default implementation of android.hidl.memory@1.0
- Ashmem
- Ion (TODO, probably in another CL)
Test: compiles (WIP)
Change-Id: I4632eeb6a0051551b54ce04d919aaf551dfc5f28
diff --git a/libhidlmemory/Android.bp b/libhidlmemory/Android.bp
new file mode 100644
index 0000000..8f27065
--- /dev/null
+++ b/libhidlmemory/Android.bp
@@ -0,0 +1,43 @@
+// Copyright (C) 2016 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+cc_library_shared {
+ name: "libhidlmemory",
+ shared_libs: [
+ "libbase",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libhidlbase",
+ "libhidltransport",
+ "android.hidl.memory@1.0"
+ ],
+ local_include_dirs: ["include"],
+ export_include_dirs: ["include"],
+
+ export_shared_lib_headers: [
+ "android.hidl.memory@1.0",
+ "libhidlbase"
+ ],
+
+ srcs: [
+ "mapping.cpp"
+ ],
+
+ product_variables: {
+ debuggable: {
+ cflags: ["-DLIBHIDL_TARGET_DEBUGGABLE"],
+ },
+ },
+}
diff --git a/libhidlmemory/include/hidlmemory/mapping.h b/libhidlmemory/include/hidlmemory/mapping.h
new file mode 100644
index 0000000..8ed0d54
--- /dev/null
+++ b/libhidlmemory/include/hidlmemory/mapping.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <android/hidl/memory/1.0/IMemory.h>
+#include <hidl/HidlSupport.h>
+
+namespace android {
+namespace hardware {
+
+sp<android::hidl::memory::V1_0::IMemory> mapMemory(const hidl_memory &memory);
+
+} // namespace hardware
+} // namespace android
\ No newline at end of file
diff --git a/libhidlmemory/mapping.cpp b/libhidlmemory/mapping.cpp
new file mode 100644
index 0000000..b4fa123
--- /dev/null
+++ b/libhidlmemory/mapping.cpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#define LOG_TAG "libhidlmemory"
+
+#include <hidlmemory/mapping.h>
+
+#include <android-base/logging.h>
+#include <android/hidl/memory/1.0/IMapper.h>
+#include <hidl/HidlSupport.h>
+
+using android::sp;
+using android::hidl::memory::V1_0::IMemory;
+
+namespace android {
+namespace hardware {
+
+sp<IMemory> mapMemory(const hidl_memory &memory) {
+ using android::hidl::memory::V1_0::IMapper;
+
+ sp<IMapper> mapper = IMapper::getService(memory.name(), true /* getStub */);
+
+ if (mapper == nullptr) {
+ LOG(FATAL) << "Could not fetch mapper for " << memory.name() << " shared memory";
+ }
+
+ if (mapper->isRemote()) {
+ LOG(FATAL) << "IMapper must be a passthrough service.";
+ }
+
+ sp<IMemory> retMemory = nullptr;
+
+ Return<void> ret = mapper->mapMemory(memory,
+ [&retMemory](const auto &mapped) {
+ retMemory = mapped;
+ });
+
+ if (!ret.isOk()) {
+ LOG(FATAL) << "hidl_memory map returned transport error.";
+ }
+
+ return retMemory;
+}
+
+} // namespace hardware
+} // namespace android
\ No newline at end of file