aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Weffers <rcstar6696@gmail.com>2017-12-12 20:45:11 +0100
committerArian <arian.kulmer@web.de>2019-10-07 11:11:29 +0200
commit154011abb8b0e9cc67c5f0620f18e080f3ae983e (patch)
treee1ea045084c6dd1c45ace9bd56f1678b31c05b4a
parente524f08e2a39b9e12ba34c4d898f323d83c46567 (diff)
shinano:init: Fix compilation dependencies with O-MR1
Change-Id: I9a0221d16bee9bbdf99d01d658d6d81ab990f45c
-rw-r--r--init/Android.mk2
-rw-r--r--init/init_shinano.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/init/Android.mk b/init/Android.mk
index 5450923..4c4ee6b 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_STATIC_LIBRARIES := libbase
+LOCAL_STATIC_LIBRARIES := libbase libselinux
LOCAL_SRC_FILES := init_shinano.cpp
LOCAL_MODULE := libinit_shinano
include $(BUILD_STATIC_LIBRARY)
diff --git a/init/init_shinano.cpp b/init/init_shinano.cpp
index f78a4a1..da3395f 100644
--- a/init/init_shinano.cpp
+++ b/init/init_shinano.cpp
@@ -31,11 +31,11 @@ static void import_kernel_nv(const std::string& key,
// We only want the bootloader version
if (key == "oemandroidboot.s1boot") {
- property_set("ro.boot.oemandroidboot.s1boot", value.c_str());
+ android::init::property_set("ro.boot.oemandroidboot.s1boot", value.c_str());
}
}
void vendor_load_properties()
{
- import_kernel_cmdline(0, import_kernel_nv);
+ android::init::import_kernel_cmdline(0, import_kernel_nv);
}