Merge "Refactor libinit_test_utils to not use libinit and expose its libraries" (d9de138e) · Commits · e / os / android_system_core

init/Android.bp

+32 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ cc_defaults {
		"-DWORLD_WRITABLE_KMSG=0",
		"-DDUMP_ON_UMOUNT_FAILURE=0",
		"-DSHUTDOWN_ZERO_TIMEOUT=0",
		"-DINIT_FULL_SOURCES",
		],
		product_variables: {
		debuggable: {
		@@ -267,6 +268,37 @@ cc_benchmark {
		static_libs: ["libinit"],
		}

		cc_defaults {
		name: "libinit_test_utils_libraries_defaults",
		shared_libs: [
		"libbase",
		"libcutils",
		"libselinux",
		"libhidl-gen-utils",
		"liblog",
		"libprocessgroup",
		"libprotobuf-cpp-lite",
		],
		}

		cc_library_static {
		name: "libinit_test_utils",
		defaults: ["libinit_test_utils_libraries_defaults"],
		cflags: [
		"-Wall",
		"-Wextra",
		"-Wno-unused-parameter",
		"-Werror",
		],
		srcs: init_common_sources + [
		"test_utils/service_utils.cpp",
		],
		whole_static_libs: [
		"libcap",
		],
		export_include_dirs: ["test_utils/include"], // for tests
		}

		// Host Verifier
		// ------------------------------------------------------------------------------

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		#include <android-base/properties.h>
		#include <android-base/strings.h>

		#if defined(__ANDROID__)
		#ifdef INIT_FULL_SOURCES
		#include "property_service.h"
		#include "selinux.h"
		#else

+2 −2

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@
		#include "service_list.h"
		#include "util.h"

		#if defined(__ANDROID__)
		#ifdef INIT_FULL_SOURCES
		#include <ApexProperties.sysprop.h>
		#include <android/api-level.h>

		@@ -303,7 +303,7 @@ void Service::Reap(const siginfo_t& siginfo) {
		return;
		}

		#if defined(__ANDROID__)
		#if INIT_FULL_SOURCES
		static bool is_apex_updatable = android::sysprop::ApexProperties::updatable().value_or(false);
		#else
		static bool is_apex_updatable = false;

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@
		#include "service_utils.h"
		#include "util.h"

		#if defined(__ANDROID__)
		#ifdef INIT_FULL_SOURCES
		#include <android/api-level.h>
		#include <sys/system_properties.h>

+1 −1