From 8d26c6bb8e942d95bd231bf705840d1737569391 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Mon, 19 Oct 2015 07:22:53 +0200 Subject: Build init as C++ Change-Id: Ie6212aa11d542a3b42a6be0ac21e48d1b400c177 Signed-off-by: Chirayu Desai --- init/Android.mk | 2 +- init/init_shinano.c | 51 --------------------------------------------------- init/init_shinano.cpp | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 init/init_shinano.c create mode 100644 init/init_shinano.cpp (limited to 'init') diff --git a/init/Android.mk b/init/Android.mk index 0e8d85a..b76d2d7 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -6,7 +6,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := system/core/init LOCAL_CFLAGS := -Wall -LOCAL_SRC_FILES := init_shinano.c +LOCAL_SRC_FILES := init_shinano.cpp LOCAL_MODULE := libinit_shinano include $(BUILD_STATIC_LIBRARY) diff --git a/init/init_shinano.c b/init/init_shinano.c deleted file mode 100644 index e278a41..0000000 --- a/init/init_shinano.c +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * Copyright (C) 2014 The CyanogenMod 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 - -#include "vendor_init.h" -#include "property_service.h" -#include "log.h" -#include "util.h" - -#include - -static void import_kernel_nv(char *name) -{ - char *value = strchr(name, '='); - int name_len = strlen(name); - - if (value == 0) return; - *value++ = 0; - if (name_len == 0) return; - - // We only want the bootloader version - if (strcmp(name, "oemandroidboot.s1boot") == 0) { - const char *boot_prop_name = name + 15; - char prop[PROP_NAME_MAX]; - int cnt; - - cnt = snprintf(prop, sizeof(prop), "ro.boot.%s", boot_prop_name); - if (cnt < PROP_NAME_MAX) - property_set(prop, value); - } -} - -void vendor_load_properties() -{ - import_kernel_cmdline(0, import_kernel_nv); -} diff --git a/init/init_shinano.cpp b/init/init_shinano.cpp new file mode 100644 index 0000000..e9ed00b --- /dev/null +++ b/init/init_shinano.cpp @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * Copyright (C) 2014 The CyanogenMod 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 + +#include "vendor_init.h" +#include "property_service.h" +#include "log.h" +#include "util.h" + +#include + +static void import_kernel_nv(char *name, __attribute__((unused)) bool foo) +{ + char *value = strchr(name, '='); + int name_len = strlen(name); + + if (value == 0) return; + *value++ = 0; + if (name_len == 0) return; + + // We only want the bootloader version + if (strcmp(name, "oemandroidboot.s1boot") == 0) { + const char *boot_prop_name = name + 15; + char prop[PROP_NAME_MAX]; + int cnt; + + cnt = snprintf(prop, sizeof(prop), "ro.boot.%s", boot_prop_name); + if (cnt < PROP_NAME_MAX) + property_set(prop, value); + } +} + +void vendor_load_properties() +{ + import_kernel_cmdline(0, import_kernel_nv); +} -- cgit v1.2.3