diff --git a/init/Android.mk b/init/Android.mk
index 37ac855..a075038 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2016 The CyanogenMod Project
-#               2017 The LineageOS Project
+#               2017-2020 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.
@@ -20,13 +20,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := system/core/init
-LOCAL_CFLAGS := -Wall -DANDROID_TARGET=\"$(TARGET_BOARD_PLATFORM)\"
+LOCAL_CFLAGS := -Wall
 LOCAL_SRC_FILES := init_msm8974.cpp
-ifneq ($(TARGET_LIBINIT_MSM8974_DEFINES_FILE),)
-  LOCAL_SRC_FILES += ../../../../$(TARGET_LIBINIT_MSM8974_DEFINES_FILE)
-endif
-LOCAL_MODULE := libinit_msm8974
-
-LOCAL_STATIC_LIBRARIES := libbase
+LOCAL_MODULE := libinit_helpers_sam8974
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/init/init_msm8974.cpp b/init/init_msm8974.cpp
index 1ecdb60..6890732 100644
--- a/init/init_msm8974.cpp
+++ b/init/init_msm8974.cpp
@@ -37,11 +37,6 @@
 
 using android::init::property_set;
 
-__attribute__ ((weak))
-void init_target_properties()
-{
-}
-
 void set_rild_libpath(char const variant[])
 {
     std::string libpath("/system/vendor/lib/libsec-ril.");
@@ -98,8 +93,3 @@ void property_override_dual(char const system_prop[],
     property_override(system_prop, value);
     property_override(vendor_prop, value);
 }
-
-void vendor_load_properties()
-{
-    init_target_properties();
-}