Snap for 6535363 from db08cf228d708ae80cb3dd959d09b60ffc0b33cd to mainline-release (b00b381c) · Commits · e / os / android_system_core

adb/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -567,7 +567,6 @@ cc_library {
		cc_binary {
		name: "adbd",
		defaults: ["adbd_defaults", "host_adbd_supported", "libadbd_binary_dependencies"],
		stl: "libc++_static",
		recovery_available: true,
		apex_available: ["com.android.adbd"],

adb/daemon/usb.cpp

+11 −3

Original line number	Diff line number	Diff line
		@@ -231,7 +231,14 @@ struct UsbFfsConnection : public Connection {
		offset += write_size;
		}
		}
		SubmitWrites();

		// Wake up the worker thread to submit writes.
		uint64_t notify = 1;
		ssize_t rc = adb_write(worker_event_fd_.get(), &notify, sizeof(notify));
		if (rc < 0) {
		PLOG(FATAL) << "failed to notify worker eventfd to submit writes";
		}

		return true;
		}

		@@ -443,6 +450,9 @@ struct UsbFfsConnection : public Connection {
		}

		ReadEvents();

		std::lock_guard<std::mutex> lock(write_mutex_);
		SubmitWrites();
		}
		});
		}
		@@ -626,8 +636,6 @@ struct UsbFfsConnection : public Connection {
		write_requests_.erase(it);
		size_t outstanding_writes = --writes_submitted_;
		LOG(DEBUG) << "USB write: reaped, down to " << outstanding_writes;

		SubmitWrites();
		}

		IoWriteBlock CreateWriteBlock(std::shared_ptr<Block> payload, size_t offset, size_t len,

libstats/pull/Android.bp

+6 −1

Original line number	Diff line number	Diff line
		@@ -85,13 +85,18 @@ cc_test {
		"libstatssocket",
		],
		test_suites: ["general-tests", "mts"],
		test_config: "libstatspull_test.xml",

		//TODO(b/153588990): Remove when the build system properly separates
		//32bit and 64bit architectures.
		compile_multilib: "both",
		multilib: {
		lib64: {
		suffix: "64",
		}
		},
		lib32: {
		suffix: "32",
		},
		},
		cflags: [
		"-Wall",

libstats/pull/libstatspull_test.xml

0 → 100644

+37 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2020 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.
		-->
		<configuration description="Runs libstatspull_test.">
		<option name="test-suite-tag" value="apct" />
		<option name="test-suite-tag" value="apct-native" />
		<option name="test-suite-tag" value="mts" />

		<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

		<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
		<option name="cleanup" value="true" />
		<option name="push" value="libstatspull_test->/data/local/tmp/libstatspull_test" />
		<option name="append-bitness" value="true" />
		</target_preparer>

		<test class="com.android.tradefed.testtype.GTest" >
		<option name="native-test-device-path" value="/data/local/tmp" />
		<option name="module-name" value="libstatspull_test" />
		</test>

		<object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
		<option name="mainline-module-package-name" value="com.google.android.os.statsd" />
		</object>
		</configuration>

libstats/socket/Android.bp

+5 −1

Original line number	Diff line number	Diff line
		@@ -127,13 +127,17 @@ cc_test {
		"libutils",
		],
		test_suites: ["device-tests", "mts"],
		test_config: "libstatssocket_test.xml",
		//TODO(b/153588990): Remove when the build system properly separates
		//32bit and 64bit architectures.
		compile_multilib: "both",
		multilib: {
		lib64: {
		suffix: "64",
		}
		},
		lib32: {
		suffix: "32",
		},
		},
		require_root: true,
		}