Hidlize IBase and use IBase instead of IBinder.
Note: system/libhidl/base is the libhidlbase project.
system/libhidl/transport/base is the
android.hidl.base@1.0 HAL files.
Test: hidl_test
Change-Id: Ic3464b5e50c0896de9b26f44a409496f8df37c39
diff --git a/base/HidlSupport.cpp b/base/HidlSupport.cpp
index 0103d14..1e383a7 100644
--- a/base/HidlSupport.cpp
+++ b/base/HidlSupport.cpp
@@ -151,8 +151,6 @@
return mSize == 0;
}
-const char* IBase::descriptor = "android.hardware.base@0.0::IBase";
-
// ----------------------------------------------------------------------
// HidlInstrumentor implementation.
HidlInstrumentor::HidlInstrumentor(const std::string &prefix) {
diff --git a/base/include/hidl/HidlSupport.h b/base/include/hidl/HidlSupport.h
index 7d649ef..0e66ceb 100644
--- a/base/include/hidl/HidlSupport.h
+++ b/base/include/hidl/HidlSupport.h
@@ -686,19 +686,6 @@
return hidl_version(major,minor);
}
-struct IBase : virtual public RefBase {
- virtual bool isRemote() const = 0;
- // HIDL reserved methods follow.
- virtual ::android::hardware::Return<void> interfaceChain(
- std::function<void(const hidl_vec<hidl_string>&)> _hidl_cb) = 0;
- // This method notifies the interface that one or more system properties have changed.
- // The default implementation calls report_sysprop_change() in libcutils, which in turn
- // calls a set of registered callbacks (eg to update trace tags).
- virtual ::android::hardware::Return<void> notifySyspropsChanged() = 0;
- // descriptor for HIDL reserved methods.
- static const char* descriptor;
-};
-
#if defined(__LP64__)
#define HAL_LIBRARY_PATH_SYSTEM "/system/lib64/hw/"
#define HAL_LIBRARY_PATH_VENDOR "/vendor/lib64/hw/"
diff --git a/transport/Android.bp b/transport/Android.bp
index ac4cb12..4f97ff6 100644
--- a/transport/Android.bp
+++ b/transport/Android.bp
@@ -16,6 +16,7 @@
"manager/1.0",
"memory/1.0",
"memory/1.0/default",
+ "base/1.0"
]
cc_library_shared {
@@ -36,9 +37,18 @@
export_include_dirs: ["include"],
- generated_sources: ["android.hidl.manager@1.0_genc++"],
- generated_headers: ["android.hidl.manager@1.0_genc++_headers"],
- export_generated_headers: ["android.hidl.manager@1.0_genc++_headers"],
+ generated_sources: [
+ "android.hidl.manager@1.0_genc++",
+ "android.hidl.base@1.0_genc++"
+ ],
+ generated_headers: [
+ "android.hidl.manager@1.0_genc++_headers",
+ "android.hidl.base@1.0_genc++_headers"
+ ],
+ export_generated_headers: [
+ "android.hidl.manager@1.0_genc++_headers",
+ "android.hidl.base@1.0_genc++_headers"
+ ],
srcs: [
"HidlBinderSupport.cpp",
diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
new file mode 100644
index 0000000..0bb6b4a
--- /dev/null
+++ b/transport/base/1.0/Android.bp
@@ -0,0 +1,50 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+genrule {
+ name: "android.hidl.base@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
+ srcs: [
+ "IBase.hal",
+ ],
+ out: [
+ "android/hidl/base/1.0/BaseAll.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hidl.base@1.0_genc++_headers",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
+ srcs: [
+ "IBase.hal",
+ ],
+ out: [
+ "android/hidl/base/1.0/IBase.h",
+ "android/hidl/base/1.0/IHwBase.h",
+ "android/hidl/base/1.0/BnBase.h",
+ "android/hidl/base/1.0/BpBase.h",
+ "android/hidl/base/1.0/BsBase.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hidl.base@1.0",
+ generated_sources: ["android.hidl.base@1.0_genc++"],
+ generated_headers: ["android.hidl.base@1.0_genc++_headers"],
+ export_generated_headers: ["android.hidl.base@1.0_genc++_headers"],
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ ],
+}
diff --git a/transport/base/1.0/Android.mk b/transport/base/1.0/Android.mk
new file mode 100644
index 0000000..1e07a22
--- /dev/null
+++ b/transport/base/1.0/Android.mk
@@ -0,0 +1,68 @@
+# This file is autogenerated by hidl-gen. Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hidl.base@1.0-java
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(local-generated-sources-dir)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+
+#
+# Build IBase.hal
+#
+GEN := $(intermediates)/android/hidl/base/1.0/IBase.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hidl:system/libhidl/transport \
+ -randroid.hidl:system/libhidl/transport \
+ android.hidl.base@1.0::IBase
+
+$(GEN): $(LOCAL_PATH)/IBase.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_JAVA_LIBRARY)
+
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hidl.base@1.0-java-static
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(local-generated-sources-dir)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+
+#
+# Build IBase.hal
+#
+GEN := $(intermediates)/android/hidl/base/1.0/IBase.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hidl:system/libhidl/transport \
+ -randroid.hidl:system/libhidl/transport \
+ android.hidl.base@1.0::IBase
+
+$(GEN): $(LOCAL_PATH)/IBase.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/transport/base/1.0/IBase.hal b/transport/base/1.0/IBase.hal
new file mode 100644
index 0000000..379213a
--- /dev/null
+++ b/transport/base/1.0/IBase.hal
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+package android.hidl.base@1.0;
+
+/*
+ * The ancestor for all interfaces.
+ *
+ * All HAL files will have this interface implicitly imported. If an interface
+ * does not explicitly extend from another interface, it will implicitly extend
+ * from IBase. (This is like java.lang.Object in Java.)
+ *
+ * Methods defined here are shared by all interfaces (this is like
+ * java.lang.Object.notify(), for example.) However, the behavior of these
+ * functions cannot be overridden.
+ */
+interface IBase {
+
+ /*
+ * Provides run-time type information for this object.
+ * For example, for the following interface definition:
+ * package android.hardware.foo@1.0;
+ * interface IParent {};
+ * interface IChild {};
+ * Calling interfaceChain on an IChild object will yield the following:
+ * ["android.hardware.foo@1.0::IChild",
+ * "android.hardware.foo@1.0::IParent"
+ * "android.hidl.base@1.0::IBase"]
+ *
+ * @return indicator a vector of descriptors of the run-time type of the
+ * object.
+ */
+ interfaceChain() generates (vec<string> indicator);
+
+ /*
+ * This method notifies the interface that one or more system properties
+ * have changed. The default implementation calls
+ * (C++) report_sysprop_change() in libcutils or
+ * (Java) android.os.SystemProperties.reportSyspropChanged,
+ * which in turn calls a set of registered callbacks (eg to update trace
+ * tags).
+ */
+ oneway notifySyspropsChanged();
+};
diff --git a/transport/include/hidl/HidlBinderSupport.h b/transport/include/hidl/HidlBinderSupport.h
index d6a308b..fb209c4 100644
--- a/transport/include/hidl/HidlBinderSupport.h
+++ b/transport/include/hidl/HidlBinderSupport.h
@@ -320,19 +320,18 @@
{ \
using ::android::sp; \
using ::android::hardware::defaultServiceManager; \
- using ::android::hardware::IBinder; \
using ::android::hidl::manager::V1_0::IServiceManager; \
sp<I##INTERFACE> iface; \
const sp<IServiceManager> sm = defaultServiceManager(); \
if (sm != nullptr && !getStub) { \
- sp<IBinder> binderIface; \
+ sp<::android::hidl::base::V1_0::IBase> base; \
::android::hardware::Return<void> ret = \
sm->get(PACKAGE "::I" #INTERFACE, serviceName.c_str(), \
- [&binderIface](sp<IBinder> iface) { \
- binderIface = iface; \
+ [&base](sp<::android::hidl::base::V1_0::IBase> found) { \
+ base = found; \
}); \
if (ret.getStatus().isOk()) { \
- iface = IHw##INTERFACE::asInterface(binderIface); \
+ iface = I##INTERFACE::castFrom(base); \
if (iface != nullptr) { \
return iface; \
} \
diff --git a/transport/manager/1.0/Android.bp b/transport/manager/1.0/Android.bp
index 212fd28..5cd06d6 100644
--- a/transport/manager/1.0/Android.bp
+++ b/transport/manager/1.0/Android.bp
@@ -3,7 +3,7 @@
genrule {
name: "android.hidl.manager@1.0_genc++",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
srcs: [
"IServiceManager.hal",
"IServiceNotification.hal",
@@ -17,7 +17,7 @@
genrule {
name: "android.hidl.manager@1.0_genc++_headers",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
srcs: [
"IServiceManager.hal",
"IServiceNotification.hal",
@@ -48,11 +48,13 @@
"liblog",
"libutils",
"libcutils",
+ "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"libutils",
+ "android.hidl.base@1.0",
],
}
diff --git a/transport/manager/1.0/Android.mk b/transport/manager/1.0/Android.mk
index 9721993..1d1b508 100644
--- a/transport/manager/1.0/Android.mk
+++ b/transport/manager/1.0/Android.mk
@@ -12,6 +12,10 @@
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+LOCAL_JAVA_LIBRARIES := \
+ android.hidl.base@1.0-java \
+
+
#
# Build IServiceManager.hal
#
@@ -24,7 +28,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hidl:system/libhidl/transport \
+ -Ljava \
+ -randroid.hidl:system/libhidl/transport \
+ -randroid.hidl:system/libhidl/transport \
android.hidl.manager@1.0::IServiceManager
$(GEN): $(LOCAL_PATH)/IServiceManager.hal
@@ -41,7 +47,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hidl:system/libhidl/transport \
+ -Ljava \
+ -randroid.hidl:system/libhidl/transport \
+ -randroid.hidl:system/libhidl/transport \
android.hidl.manager@1.0::IServiceNotification
$(GEN): $(LOCAL_PATH)/IServiceNotification.hal
@@ -60,6 +68,10 @@
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android.hidl.base@1.0-java-static \
+
+
#
# Build IServiceManager.hal
#
@@ -72,7 +84,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hidl:system/libhidl/transport \
+ -Ljava \
+ -randroid.hidl:system/libhidl/transport \
+ -randroid.hidl:system/libhidl/transport \
android.hidl.manager@1.0::IServiceManager
$(GEN): $(LOCAL_PATH)/IServiceManager.hal
@@ -89,7 +103,9 @@
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava -randroid.hidl:system/libhidl/transport \
+ -Ljava \
+ -randroid.hidl:system/libhidl/transport \
+ -randroid.hidl:system/libhidl/transport \
android.hidl.manager@1.0::IServiceNotification
$(GEN): $(LOCAL_PATH)/IServiceNotification.hal
diff --git a/transport/memory/1.0/Android.bp b/transport/memory/1.0/Android.bp
index 5839197..efebe7e 100644
--- a/transport/memory/1.0/Android.bp
+++ b/transport/memory/1.0/Android.bp
@@ -3,7 +3,7 @@
genrule {
name: "android.hidl.memory@1.0_genc++",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
srcs: [
"IAllocator.hal",
"IMapper.hal",
@@ -19,7 +19,7 @@
genrule {
name: "android.hidl.memory@1.0_genc++_headers",
tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
srcs: [
"IAllocator.hal",
"IMapper.hal",
@@ -56,11 +56,13 @@
"liblog",
"libutils",
"libcutils",
+ "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"libutils",
+ "android.hidl.base@1.0",
],
}
diff --git a/transport/memory/1.0/default/Android.bp b/transport/memory/1.0/default/Android.bp
index b5079e8..4bc24a2 100644
--- a/transport/memory/1.0/default/Android.bp
+++ b/transport/memory/1.0/default/Android.bp
@@ -31,6 +31,7 @@
"libutils",
"libhidlbase",
"libhidltransport",
+ "android.hidl.base@1.0",
"android.hidl.memory@1.0",
],
}
@@ -42,6 +43,7 @@
init_rc: ["android.hidl.memory@1.0-service.rc"],
shared_libs: [
+ "android.hidl.base@1.0",
"android.hidl.memory@1.0",
"libhidlbase",
"libhidltransport",
diff --git a/update-makefiles.sh b/update-makefiles.sh
index 4e17f64..6a77a7d 100755
--- a/update-makefiles.sh
+++ b/update-makefiles.sh
@@ -1,12 +1,15 @@
#!/bin/bash
# TODO(b/33276472)
-
-if [ ! -d system/libhidl ] ; then
- echo "Where is system/libhidl?";
+if [ ! -d system/libhidl/transport ] ; then
+ echo "Where is system/libhidl/transport?";
exit 1;
fi
+#base
+hidl-gen -Lmakefile -r android.hidl:system/libhidl/transport android.hidl.base@1.0
+hidl-gen -Landroidbp -r android.hidl:system/libhidl/transport android.hidl.base@1.0
+
#manager
hidl-gen -Lmakefile -r android.hidl:system/libhidl/transport android.hidl.manager@1.0
hidl-gen -Landroidbp -r android.hidl:system/libhidl/transport android.hidl.manager@1.0