diff options
author | Joachim Sauer <jsauer@google.com> | 2017-11-29 11:21:41 +0000 |
---|---|---|
committer | Joachim Sauer <jsauer@google.com> | 2017-11-29 11:35:46 +0000 |
commit | c68b413ee56b0a309ff0b1c44cd2749c6028c3ee (patch) | |
tree | a6e1124b9c24140f78f5e3a304ea17c5148837ec /libhidlmemory | |
parent | 2c16d029914a7908e225e9b7dca555b32638ea57 (diff) | |
download | libhidl-c68b413ee56b0a309ff0b1c44cd2749c6028c3ee.tar.gz |
Revert "Add IMemoryToken and the HidlMemoryToken"
This reverts commit 2c16d029914a7908e225e9b7dca555b32638ea57.
Bug: 69640337
Test: m tests
Change-Id: Ibe3b751f98646ccf84e65bfebd3e639f9ec3c7e2
Diffstat (limited to 'libhidlmemory')
-rw-r--r-- | libhidlmemory/Android.bp | 5 | ||||
-rw-r--r-- | libhidlmemory/HidlMemoryToken.cpp | 29 | ||||
-rw-r--r-- | libhidlmemory/include/hidlmemory/HidlMemoryToken.h | 36 |
3 files changed, 1 insertions, 69 deletions
diff --git a/libhidlmemory/Android.bp b/libhidlmemory/Android.bp index 2135ef3..e854ab5 100644 --- a/libhidlmemory/Android.bp +++ b/libhidlmemory/Android.bp @@ -27,20 +27,17 @@ cc_library { "libcutils", "libhidlbase", "libhidltransport", - "android.hidl.memory@1.0", - "android.hidl.memory.token@1.0", + "android.hidl.memory@1.0" ], local_include_dirs: ["include"], export_include_dirs: ["include"], export_shared_lib_headers: [ "android.hidl.memory@1.0", - "android.hidl.memory.token@1.0", "libhidlbase" ], srcs: [ - "HidlMemoryToken.cpp", "mapping.cpp" ], diff --git a/libhidlmemory/HidlMemoryToken.cpp b/libhidlmemory/HidlMemoryToken.cpp deleted file mode 100644 index 3840183..0000000 --- a/libhidlmemory/HidlMemoryToken.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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 <hidlmemory/HidlMemoryToken.h> - -namespace android { -namespace hardware { - -HidlMemoryToken::HidlMemoryToken(sp<HidlMemory> memory) : mMemory(memory) {} - -Return<void> HidlMemoryToken::get(get_cb _hidl_cb) { - _hidl_cb(*mMemory); - return Void(); -} - -} // namespace hardware -} // namespace android diff --git a/libhidlmemory/include/hidlmemory/HidlMemoryToken.h b/libhidlmemory/include/hidlmemory/HidlMemoryToken.h deleted file mode 100644 index 4020377..0000000 --- a/libhidlmemory/include/hidlmemory/HidlMemoryToken.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2017 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. - */ -#ifndef ANDROID_HARDWARE_HIDLMEMORYTOKEN_H -#define ANDROID_HARDWARE_HIDLMEMORYTOKEN_H - -#include <android/hidl/memory/token/1.0/IMemoryToken.h> - -namespace android { -namespace hardware { - -class HidlMemoryToken : public virtual ::android::hidl::memory::token::V1_0::IMemoryToken { - public: - Return<void> get(get_cb _hidl_cb) override; - - HidlMemoryToken(sp<HidlMemory> memory); - - protected: - sp<HidlMemory> mMemory; -}; - -} // namespace hardware -} // namespace android -#endif |