diff --git a/tests/safeunion/cpp/1.0/.hidl_for_test b/tests/safeunion/cpp/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/safeunion/cpp/1.0/Android.bp b/tests/safeunion/cpp/1.0/Android.bp new file mode 100644 index 0000000000..11117195c3 --- /dev/null +++ b/tests/safeunion/cpp/1.0/Android.bp @@ -0,0 +1,14 @@ +// This file is autogenerated by hidl-gen -Landroidbp. + +hidl_interface { + name: "android.hardware.tests.safeunion.cpp@1.0", + root: "android.hardware", + srcs: [ + "ICppSafeUnion.hal", + ], + interfaces: [ + "android.hidl.base@1.0", + ], + gen_java: false, +} + diff --git a/tests/safeunion/cpp/1.0/ICppSafeUnion.hal b/tests/safeunion/cpp/1.0/ICppSafeUnion.hal new file mode 100644 index 0000000000..cc1a91e0de --- /dev/null +++ b/tests/safeunion/cpp/1.0/ICppSafeUnion.hal @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2018 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. + */ + +package android.hardware.tests.safeunion.cpp@1.0; + +/** + * Safe union for cpp-only types. + */ +interface ICppSafeUnion { + safe_union PointerFmqSafeUnion { + interface iface; + fmq_sync fmqSync; + fmq_unsync fmqUnsync; + }; + safe_union FmqSafeUnion { + fmq_sync fmqSync; + fmq_unsync fmqUnsync; + }; + + repeatPointerFmqSafeUnion(PointerFmqSafeUnion fmq) generates (PointerFmqSafeUnion fmq); + repeatFmqSafeUnion(FmqSafeUnion fmq) generates (FmqSafeUnion fmq); +}; diff --git a/tests/safeunion/cpp/1.0/default/Android.bp b/tests/safeunion/cpp/1.0/default/Android.bp new file mode 100644 index 0000000000..210a63923d --- /dev/null +++ b/tests/safeunion/cpp/1.0/default/Android.bp @@ -0,0 +1,22 @@ +cc_library { + name: "android.hardware.tests.safeunion.cpp@1.0-impl", + relative_install_path: "hw", + srcs: [ + "CppSafeUnion.cpp", + ], + shared_libs: [ + "libbase", + "libcutils", + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + ], + + // These are static libs only for testing purposes and portability. Shared + // libs should be used on device. + static_libs: [ + "android.hardware.tests.safeunion.cpp@1.0", + ], +} diff --git a/tests/safeunion/cpp/1.0/default/CppSafeUnion.cpp b/tests/safeunion/cpp/1.0/default/CppSafeUnion.cpp new file mode 100644 index 0000000000..dcbd9d7df2 --- /dev/null +++ b/tests/safeunion/cpp/1.0/default/CppSafeUnion.cpp @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2018 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 "CppSafeUnion.h" + +namespace android { +namespace hardware { +namespace tests { +namespace safeunion { +namespace cpp { +namespace V1_0 { +namespace implementation { + +Return CppSafeUnion::repeatPointerFmqSafeUnion(const ICppSafeUnion::PointerFmqSafeUnion& fmq, + repeatPointerFmqSafeUnion_cb _hidl_cb) { + _hidl_cb(fmq); + return Void(); +} + +Return CppSafeUnion::repeatFmqSafeUnion(const ICppSafeUnion::FmqSafeUnion& fmq, + repeatFmqSafeUnion_cb _hidl_cb) { + _hidl_cb(fmq); + return Void(); +} + +ICppSafeUnion* HIDL_FETCH_ICppSafeUnion(const char* /* name */) { + return new CppSafeUnion(); +} + +} // namespace implementation +} // namespace V1_0 +} // namespace cpp +} // namespace safeunion +} // namespace tests +} // namespace hardware +} // namespace android diff --git a/tests/safeunion/cpp/1.0/default/CppSafeUnion.h b/tests/safeunion/cpp/1.0/default/CppSafeUnion.h new file mode 100644 index 0000000000..a128273ef0 --- /dev/null +++ b/tests/safeunion/cpp/1.0/default/CppSafeUnion.h @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2018 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. + */ + +#pragma once + +#include +#include +#include + +namespace android { +namespace hardware { +namespace tests { +namespace safeunion { +namespace cpp { +namespace V1_0 { +namespace implementation { + +using ::android::sp; +using ::android::hardware::hidl_array; +using ::android::hardware::hidl_memory; +using ::android::hardware::hidl_string; +using ::android::hardware::hidl_vec; +using ::android::hardware::Return; +using ::android::hardware::Void; + +struct CppSafeUnion : public ICppSafeUnion { + Return repeatPointerFmqSafeUnion(const ICppSafeUnion::PointerFmqSafeUnion& fmq, + repeatPointerFmqSafeUnion_cb _hidl_cb) override; + Return repeatFmqSafeUnion(const ICppSafeUnion::FmqSafeUnion& fmq, + repeatFmqSafeUnion_cb _hidl_cb) override; +}; + +extern "C" ICppSafeUnion* HIDL_FETCH_ICppSafeUnion(const char* name); + +} // namespace implementation +} // namespace V1_0 +} // namespace cpp +} // namespace safeunion +} // namespace tests +} // namespace hardware +} // namespace android