Make change and version bump to r_aml_300801400 for mainline module file:... (f46bbc56) · Commits · e / os / android_system_core

adb/apex/apex_manifest.json

+1 −1

Original line number	Diff line number	Diff line
		{
		"name": "com.android.adbd",
		"version": 300801300
		"version": 300801400
		}

fs_mgr/liblp/device_test.cpp

+0 −4

Original line number	Diff line number	Diff line
		@@ -56,10 +56,6 @@ TEST_F(DeviceTest, BlockDeviceInfo) {

		// Having an alignment offset > alignment doesn't really make sense.
		EXPECT_LT(device_info.alignment_offset, device_info.alignment);

		if (IPropertyFetcher::GetInstance()->GetBoolProperty("ro.virtual_ab.enabled", false)) {
		EXPECT_EQ(device_info.alignment_offset, 0);
		}
		}

		TEST_F(DeviceTest, ReadSuperPartitionCurrentSlot) {

libstats/socket/Android.bp

+1 −20

Original line number	Diff line number	Diff line
		@@ -89,25 +89,6 @@ cc_library_headers {
		min_sdk_version: "29",
		}

		cc_benchmark {
		name: "libstatssocket_benchmark",
		srcs: [
		"benchmark/main.cpp",
		"benchmark/stats_event_benchmark.cpp",
		],
		cflags: [
		"-Wall",
		"-Werror",
		],
		static_libs: [
		"libstatssocket_private",
		],
		shared_libs: [
		"libcutils",
		"libgtest_prod",
		],
		}

		cc_test {
		name: "libstatssocket_test",
		srcs: [
		@@ -128,7 +109,7 @@ cc_test {
		],
		test_suites: ["device-tests", "mts"],
		test_config: "libstatssocket_test.xml",
		//TODO(b/153588990): Remove when the build system properly separates
		//TODO(b/153588990): Remove when the build system properly separates.
		//32bit and 64bit architectures.
		compile_multilib: "both",
		multilib: {

libstats/socket/benchmark/main.cpp

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 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.
		*/

		#include <benchmark/benchmark.h>

		BENCHMARK_MAIN();

libstats/socket/benchmark/stats_event_benchmark.cpp

deleted100644 → 0

+0 −54

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 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.
		*/

		#include "benchmark/benchmark.h"
		#include "stats_event.h"

		static AStatsEvent* constructStatsEvent() {
		AStatsEvent* event = AStatsEvent_obtain();
		AStatsEvent_setAtomId(event, 100);

		// randomly sample atom size
		int numElements = rand() % 800;
		for (int i = 0; i < numElements; i++) {
		AStatsEvent_writeInt32(event, i);
		}

		return event;
		}

		static void BM_stats_event_truncate_buffer(benchmark::State& state) {
		while (state.KeepRunning()) {
		AStatsEvent* event = constructStatsEvent();
		AStatsEvent_build(event);
		AStatsEvent_write(event);
		AStatsEvent_release(event);
		}
		}

		BENCHMARK(BM_stats_event_truncate_buffer);

		static void BM_stats_event_full_buffer(benchmark::State& state) {
		while (state.KeepRunning()) {
		AStatsEvent* event = constructStatsEvent();
		AStatsEvent_truncateBuffer(event, false);
		AStatsEvent_build(event);
		AStatsEvent_write(event);
		AStatsEvent_release(event);
		}
		}

		BENCHMARK(BM_stats_event_full_buffer);