Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f624fa6 authored Sep 01, 2022 by Colin Cross Committed by Gerrit Code Review Sep 01, 2022

Merge changes I52fc9e14,I2a1aac6d

* changes:
  Use host_linux instead of linux_glibc
  Use size_t instead of uint

parents 19b284c5 650a63e4

system/build/Android.bp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -237,7 +237,7 @@ fluoride_defaults {
	"android.system.suspend.control-V1-ndk",		"android.system.suspend.control-V1-ndk",
	],		],
	},		},
	linux_glibc: {		host_linux: {
	shared_libs: [		shared_libs: [
	"android.hardware.bluetooth.audio@2.0",		"android.hardware.bluetooth.audio@2.0",
	"android.hardware.bluetooth.audio@2.1",		"android.hardware.bluetooth.audio@2.1",
	@@ -299,7 +299,7 @@ fluoride_defaults {
	// libstatslog_bt -> libbinder doesn't build on mac		// libstatslog_bt -> libbinder doesn't build on mac
	enabled: false,		enabled: false,
	},		},
	linux_glibc: {		host_linux: {
	shared_libs: [		shared_libs: [
	"android.hardware.bluetooth@1.0",		"android.hardware.bluetooth@1.0",
	"android.hardware.bluetooth@1.1",		"android.hardware.bluetooth@1.1",

system/gd/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -448,7 +448,7 @@ cc_test {
	"libcutils",		"libcutils",
	],		],
	},		},
	linux_glibc: {		host_linux: {
	shared_libs: [		shared_libs: [
	"android.hardware.bluetooth@1.0",		"android.hardware.bluetooth@1.0",
	"android.hardware.bluetooth@1.1",		"android.hardware.bluetooth@1.1",

system/osi/src/properties.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -81,7 +81,7 @@ std::vector<uint32_t> osi_property_get_uintlist(
	}		}

	std::vector<uint32_t> list;		std::vector<uint32_t> list;
	for (uint i = 0; i < result->size(); i++) {		for (size_t i = 0; i < result->size(); i++) {
	// Build a string of all the chars until the next comma or end of the		// Build a string of all the chars until the next comma or end of the
	// string is reached. If any char is not a digit, then return the default.		// string is reached. If any char is not a digit, then return the default.
	std::string value;		std::string value;