Merge "Fix implicit conversions"
diff --git a/Android.bp b/Android.bp
index ed29f5b..731d87b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -87,6 +87,7 @@
whole_static_libs: [
"libhwbinder-impl-internal",
],
+ min_sdk_version: "29",
}
// Only libhwbinder_benchmark needs to have pgo enabled. When all places
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/libhidlmemory/Android.bp b/libhidlmemory/Android.bp
index 3ba408f..bafb3ef 100644
--- a/libhidlmemory/Android.bp
+++ b/libhidlmemory/Android.bp
@@ -42,12 +42,12 @@
export_shared_lib_headers: [
"android.hidl.memory@1.0",
"android.hidl.memory.token@1.0",
- "libhidlbase"
+ "libhidlbase",
],
srcs: [
"HidlMemoryToken.cpp",
- "mapping.cpp"
+ "mapping.cpp",
],
product_variables: {
@@ -55,4 +55,5 @@
cflags: ["-DLIBHIDL_TARGET_DEBUGGABLE"],
},
},
+ min_sdk_version: "29",
}
diff --git a/transport/HidlLazyUtils.cpp b/transport/HidlLazyUtils.cpp
index b943c99..d00b461 100644
--- a/transport/HidlLazyUtils.cpp
+++ b/transport/HidlLazyUtils.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "HidlLazyUtils"
+
#include <hidl/HidlLazyUtils.h>
#include <hidl/HidlTransportSupport.h>
diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index 3601016..a69cf3e 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -192,6 +192,7 @@
tryShortenProcessName(descriptor);
}
+// only used by prebuilts - should be able to remove
void onRegistration(const std::string& packageName, const std::string& interfaceName,
const std::string& instanceName) {
return onRegistrationImpl(packageName + "::" + interfaceName, instanceName);
@@ -209,8 +210,8 @@
using android::hidl::manager::V1_2::BnHwServiceManager;
using android::hidl::manager::V1_2::BpHwServiceManager;
- static std::mutex gDefaultServiceManagerLock;
- static sp<IServiceManager1_2> gDefaultServiceManager;
+ static std::mutex& gDefaultServiceManagerLock = *new std::mutex;
+ static sp<IServiceManager1_2>& gDefaultServiceManager = *new sp<IServiceManager1_2>;
{
std::lock_guard<std::mutex> _l(gDefaultServiceManagerLock);
diff --git a/transport/token/1.0/utils/Android.bp b/transport/token/1.0/utils/Android.bp
index 8e23c62..5ccbe75 100644
--- a/transport/token/1.0/utils/Android.bp
+++ b/transport/token/1.0/utils/Android.bp
@@ -45,7 +45,7 @@
],
export_include_dirs: [
- "include"
+ "include",
],
+ min_sdk_version: "29",
}
-
diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk
index bca1cdc..d873e29 100644
--- a/vintfdata/Android.mk
+++ b/vintfdata/Android.mk
@@ -77,6 +77,7 @@
$(GEN): PRIVATE_SYSTEM_MANIFEST_INPUT_FILES := $(SYSTEM_MANIFEST_INPUT_FILES)
$(GEN): $(SYSTEM_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf
+ PLATFORM_SYSTEMSDK_VERSIONS="$(PLATFORM_SYSTEMSDK_VERSIONS)" \
$(HOST_OUT_EXECUTABLES)/assemble_vintf \
-i $(call normalize-path-list,$(PRIVATE_SYSTEM_MANIFEST_INPUT_FILES)) \
-o $@
@@ -115,7 +116,6 @@
$(GEN): PRIVATE_VINTF_VNDK_VERSION := $(VINTF_VNDK_VERSION)
$(GEN): $(SYSTEM_EXT_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf
PROVIDED_VNDK_VERSIONS="$(PRIVATE_VINTF_VNDK_VERSION) $(PRODUCT_EXTRA_VNDK_VERSIONS)" \
- PLATFORM_SYSTEMSDK_VERSIONS="$(PLATFORM_SYSTEMSDK_VERSIONS)" \
$(HOST_OUT_EXECUTABLES)/assemble_vintf \
-i $(call normalize-path-list,$(PRIVATE_SYSTEM_EXT_MANIFEST_FILES)) \
-o $@
