Snap for 12205827 from 4ce193e013b792f700cce3c6dc7c017d23390ec8 to 24Q4-release (608d59ac) · Commits · e / os / android_system_core

debuggerd/debuggerd_test.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		#include <dlfcn.h>
		#include <err.h>
		#include <fcntl.h>
		#include <inttypes.h>
		#include <linux/prctl.h>
		#include <malloc.h>
		#include <pthread.h>
		@@ -69,7 +70,6 @@
		#include "crash_test.h"
		#include "debuggerd/handler.h"
		#include "gtest/gtest.h"
		#include "libdebuggerd/utility.h"
		#include "protocol.h"
		#include "tombstoned/tombstoned.h"
		#include "util.h"
		@@ -86,6 +86,7 @@ using ::testing::HasSubstr;
		#define ARCH_SUFFIX ""
		#endif

		constexpr size_t kTagGranuleSize = 16;
		constexpr char kWaitForDebuggerKey[] = "debug.debuggerd.wait_for_debugger";

		#define TIMEOUT(seconds, expr) \

+7 −9

Original line number	Diff line number	Diff line
		@@ -281,17 +281,9 @@ cc_defaults {
		header_libs: [
		"libstorage_literals_headers",
		],
		compile_multilib: "both",
		multilib: {
		lib32: {
		suffix: "32",
		},
		lib64: {
		suffix: "64",
		},
		},
		auto_gen_config: true,
		require_root: true,
		compile_multilib: "first",
		}

		cc_test {
		@@ -324,6 +316,12 @@ cc_test {
		test_options: {
		// Legacy VAB launched in Android R.
		min_shipping_api_level: 30,
		test_runner_options: [
		{
		name: "force-no-test-error",
		value: "false",
		},
		],
		},
		}

+1 −11