Merge "Initialize the appcompat system property folder" into main (1f5e8771) · Commits · e / os / android_system_core

init/property_service.cpp

+13 −3

Original line number	Diff line number	Diff line
		@@ -76,6 +76,10 @@
		#include "system/core/init/property_service.pb.h"
		#include "util.h"

		static constexpr char APPCOMPAT_OVERRIDE_PROP_FOLDERNAME[] =
		"/dev/__properties__/appcompat_override";
		static constexpr char APPCOMPAT_OVERRIDE_PROP_TREE_FILE[] =
		"/dev/__properties__/appcompat_override/property_info";
		using namespace std::literals;

		using android::base::ErrnoError;
		@@ -1279,11 +1283,17 @@ void CreateSerializedPropertyInfo() {
		return;
		}

		constexpr static const char kPropertyInfosPath[] = "/dev/__properties__/property_info";
		if (!WriteStringToFile(serialized_contexts, kPropertyInfosPath, 0444, 0, 0, false)) {
		if (!WriteStringToFile(serialized_contexts, PROP_TREE_FILE, 0444, 0, 0, false)) {
		PLOG(ERROR) << "Unable to write serialized property infos to file";
		}
		selinux_android_restorecon(kPropertyInfosPath, 0);
		selinux_android_restorecon(PROP_TREE_FILE, 0);

		mkdir(APPCOMPAT_OVERRIDE_PROP_FOLDERNAME, S_IRWXU \| S_IXGRP \| S_IXOTH);
		if (!WriteStringToFile(serialized_contexts, APPCOMPAT_OVERRIDE_PROP_TREE_FILE, 0444, 0, 0,
		false)) {
		PLOG(ERROR) << "Unable to write vendor overrides to file";
		}
		selinux_android_restorecon(APPCOMPAT_OVERRIDE_PROP_TREE_FILE, 0);
		}

		static void ExportKernelBootProps() {

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@
		#include <stdint.h>
		#include <stdlib.h>

		static constexpr char PROP_TREE_FILE[] = "/dev/__properties__/property_info";

		namespace android {
		namespace properties {