From 6b9bae82eee6bb0d265555f577ff3067009eb161 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 19 Oct 2016 10:52:54 -0700 Subject: [PATCH] Removed overloaded functions from IFoo.hal. Bug: 31758541 Test: hidl_test Change-Id: Ic92cf9996357a8aa9b3785540784c686887032e0 --- tests/bar/1.0/default/Bar.cpp | 4 ---- tests/bar/1.0/default/Bar.h | 1 - tests/foo/1.0/IFoo.hal | 1 - tests/foo/1.0/default/Android.bp | 2 -- tests/foo/1.0/default/Foo.cpp | 5 ---- tests/foo/1.0/default/Foo.h | 1 - tests/foo/1.0/default/MyTypes.cpp | 21 ---------------- tests/foo/1.0/default/MyTypes.h | 36 ---------------------------- tests/foo/1.0/default/TheirTypes.cpp | 21 ---------------- tests/foo/1.0/default/TheirTypes.h | 36 ---------------------------- 10 files changed, 128 deletions(-) delete mode 100644 tests/foo/1.0/default/MyTypes.cpp delete mode 100644 tests/foo/1.0/default/MyTypes.h delete mode 100644 tests/foo/1.0/default/TheirTypes.cpp delete mode 100644 tests/foo/1.0/default/TheirTypes.h diff --git a/tests/bar/1.0/default/Bar.cpp b/tests/bar/1.0/default/Bar.cpp index 6da9eec4e5..34ec087e23 100644 --- a/tests/bar/1.0/default/Bar.cpp +++ b/tests/bar/1.0/default/Bar.cpp @@ -21,10 +21,6 @@ Return Bar::doThis(float param) { return mFoo->doThis(param); } -Return Bar::doThis(uint32_t param) { - return mFoo->doThis(param); -} - Return Bar::doThatAndReturnSomething( int64_t param) { return mFoo->doThatAndReturnSomething(param); diff --git a/tests/bar/1.0/default/Bar.h b/tests/bar/1.0/default/Bar.h index ae18d93ce6..d2c2635e52 100644 --- a/tests/bar/1.0/default/Bar.h +++ b/tests/bar/1.0/default/Bar.h @@ -29,7 +29,6 @@ struct Bar : public IBar { // Methods from ::android::hardware::tests::foo::V1_0::IFoo follow. virtual Return doThis(float param) override; - virtual Return doThis(uint32_t param) override; virtual Return doThatAndReturnSomething(int64_t param) override; virtual Return doQuiteABit(int32_t a, int64_t b, float c, double d) override; virtual Return doSomethingElse(const hidl_array& param, doSomethingElse_cb _hidl_cb) override; diff --git a/tests/foo/1.0/IFoo.hal b/tests/foo/1.0/IFoo.hal index b6ef5c8799..2afaec1b5d 100644 --- a/tests/foo/1.0/IFoo.hal +++ b/tests/foo/1.0/IFoo.hal @@ -81,7 +81,6 @@ interface IFoo { }; doThis(float param); - doThis(uint32_t param); doThatAndReturnSomething(int64_t param) generates (int32_t result); doQuiteABit(int32_t a, int64_t b, float c, double d) generates (double something); doSomethingElse(int32_t[15] param) generates (int32_t[32] something); diff --git a/tests/foo/1.0/default/Android.bp b/tests/foo/1.0/default/Android.bp index a2acd14a2c..90295a9407 100644 --- a/tests/foo/1.0/default/Android.bp +++ b/tests/foo/1.0/default/Android.bp @@ -6,8 +6,6 @@ cc_library_shared { srcs: [ "Foo.cpp", "FooCallback.cpp", - "MyTypes.cpp", - "TheirTypes.cpp", ], shared_libs: [ diff --git a/tests/foo/1.0/default/Foo.cpp b/tests/foo/1.0/default/Foo.cpp index 57d4b6b660..cadb151097 100644 --- a/tests/foo/1.0/default/Foo.cpp +++ b/tests/foo/1.0/default/Foo.cpp @@ -21,11 +21,6 @@ Return Foo::doThis(float param) { return Void(); } -Return Foo::doThis(uint32_t param) { - ALOGI("SERVER(Foo) doThis (int) (%d)", param); - return Void(); -} - Return Foo::doThatAndReturnSomething( int64_t param) { LOG(INFO) << "SERVER(Foo) doThatAndReturnSomething(" << param << ")"; diff --git a/tests/foo/1.0/default/Foo.h b/tests/foo/1.0/default/Foo.h index 804a6a3d5e..b3785d2c1c 100644 --- a/tests/foo/1.0/default/Foo.h +++ b/tests/foo/1.0/default/Foo.h @@ -25,7 +25,6 @@ using ::android::sp; struct Foo : public IFoo { // Methods from ::android::hardware::tests::foo::V1_0::IFoo follow. virtual Return doThis(float param) override; - virtual Return doThis(uint32_t param) override; virtual Return doThatAndReturnSomething(int64_t param) override; virtual Return doQuiteABit(int32_t a, int64_t b, float c, double d) override; virtual Return doSomethingElse(const hidl_array& param, doSomethingElse_cb _hidl_cb) override; diff --git a/tests/foo/1.0/default/MyTypes.cpp b/tests/foo/1.0/default/MyTypes.cpp deleted file mode 100644 index 0d1a4581b3..0000000000 --- a/tests/foo/1.0/default/MyTypes.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "MyTypes.h" - -namespace android { -namespace hardware { -namespace tests { -namespace foo { -namespace V1_0 { -namespace implementation { - -// Methods from ::android::hardware::tests::foo::V1_0::IMyTypes follow. - -IMyTypes* HIDL_FETCH_IMyTypes(const char* /* name */) { - return new MyTypes(); -} - -} // namespace implementation -} // namespace V1_0 -} // namespace foo -} // namespace tests -} // namespace hardware -} // namespace android diff --git a/tests/foo/1.0/default/MyTypes.h b/tests/foo/1.0/default/MyTypes.h deleted file mode 100644 index 6e9a3e12d0..0000000000 --- a/tests/foo/1.0/default/MyTypes.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef HIDL_GENERATED_android_hardware_tests_foo_V1_0_MyTypes_H_ -#define HIDL_GENERATED_android_hardware_tests_foo_V1_0_MyTypes_H_ - -#include -#include - -#include -namespace android { -namespace hardware { -namespace tests { -namespace foo { -namespace V1_0 { -namespace implementation { - -using ::android::hardware::tests::foo::V1_0::IMyTypes; -using ::android::hardware::Return; -using ::android::hardware::Void; -using ::android::hardware::hidl_vec; -using ::android::hardware::hidl_string; -using ::android::sp; - -struct MyTypes : public IMyTypes { - // Methods from ::android::hardware::tests::foo::V1_0::IMyTypes follow. - -}; - -extern "C" IMyTypes* HIDL_FETCH_IMyTypes(const char* name); - -} // namespace implementation -} // namespace V1_0 -} // namespace foo -} // namespace tests -} // namespace hardware -} // namespace android - -#endif // HIDL_GENERATED_android_hardware_tests_foo_V1_0_MyTypes_H_ diff --git a/tests/foo/1.0/default/TheirTypes.cpp b/tests/foo/1.0/default/TheirTypes.cpp deleted file mode 100644 index 0f678f0aef..0000000000 --- a/tests/foo/1.0/default/TheirTypes.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "TheirTypes.h" - -namespace android { -namespace hardware { -namespace tests { -namespace foo { -namespace V1_0 { -namespace implementation { - -// Methods from ::android::hardware::tests::foo::V1_0::ITheirTypes follow. - -ITheirTypes* HIDL_FETCH_ITheirTypes(const char* /* name */) { - return new TheirTypes(); -} - -} // namespace implementation -} // namespace V1_0 -} // namespace foo -} // namespace tests -} // namespace hardware -} // namespace android diff --git a/tests/foo/1.0/default/TheirTypes.h b/tests/foo/1.0/default/TheirTypes.h deleted file mode 100644 index 24ade70a05..0000000000 --- a/tests/foo/1.0/default/TheirTypes.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef HIDL_GENERATED_android_hardware_tests_foo_V1_0_TheirTypes_H_ -#define HIDL_GENERATED_android_hardware_tests_foo_V1_0_TheirTypes_H_ - -#include -#include - -#include -namespace android { -namespace hardware { -namespace tests { -namespace foo { -namespace V1_0 { -namespace implementation { - -using ::android::hardware::tests::foo::V1_0::ITheirTypes; -using ::android::hardware::Return; -using ::android::hardware::Void; -using ::android::hardware::hidl_vec; -using ::android::hardware::hidl_string; -using ::android::sp; - -struct TheirTypes : public ITheirTypes { - // Methods from ::android::hardware::tests::foo::V1_0::ITheirTypes follow. - -}; - -extern "C" ITheirTypes* HIDL_FETCH_ITheirTypes(const char* name); - -} // namespace implementation -} // namespace V1_0 -} // namespace foo -} // namespace tests -} // namespace hardware -} // namespace android - -#endif // HIDL_GENERATED_android_hardware_tests_foo_V1_0_TheirTypes_H_