suzuran: Adapted commit d79435d to LineageOS 15.1. (212cf4da) · Commits · e / devices / android_device_sony_suzuran

init_suzuran/Android.bp

deleted100644 → 0

+0 −27

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

		cc_library_static {
		name: "libinit_suzuran",
		recovery_available: true,
		srcs: ["init_suzuran.cpp"],
		include_dirs: [
		"system/core/init",
		"external/selinux/libselinux/include",
		"external/libcap/libcap/include"
		],
		shared_libs: ["libbase"],
		}

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		#
		# Copyright (C) 2017 The LineageOS 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.
		#

		ifeq ($(TARGET_INIT_VENDOR_LIB),libinit_suzuran)

		LOCAL_PATH := $(call my-dir)

		include $(CLEAR_VARS)
		LOCAL_MODULE_TAGS := optional
		LOCAL_C_INCLUDES := \
		system/core/base/include \
		system/core/init \
		external/selinux/libselinux/include \
		external/libcap/libcap/include
		LOCAL_CFLAGS := -Wall
		LOCAL_SRC_FILES := init_suzuran.cpp
		LOCAL_MODULE := libinit_suzuran
		include $(BUILD_STATIC_LIBRARY)

		endif

+2 −4

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@
		#include "property_service.h"
		#include "util.h"

		using android::init::ImportKernelCmdline;
		using android::init::import_kernel_cmdline;

		constexpr auto LTALABEL_PATH = "/lta-label/pages/menu.htm";

		@@ -94,7 +94,5 @@ static void import_kernel_nv(const std::string& key,

		void vendor_load_properties()
		{
		ImportKernelCmdline([&](const std::string& key, const std::string& value) {
		import_kernel_nv(key, value, false);
		});
		import_kernel_cmdline(0, import_kernel_nv);
		}