diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..2bc1dfa
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,21 @@
+/**
+ * Copyright (C) 2019-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.
+ * 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.
+ *
+ * This file is generated by device/samsung/matisse-common/setup-makefiles.sh
+ */
+
+soong_namespace {
+}
+
diff --git a/Android.mk b/Android.mk
index 168e3ae..e0b7cfc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,17 +19,6 @@ LOCAL_PATH := $(call my-dir)
 
 ifneq ($(filter matissewifi matisse3g matisselte,$(TARGET_DEVICE)),)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := libtime_genoff
-LOCAL_MODULE_OWNER := samsung
-LOCAL_SRC_FILES := proprietary/vendor/lib/libtime_genoff.so
-LOCAL_MULTILIB := 32
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_VENDOR_MODULE := true
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := TimeService
 LOCAL_MODULE_OWNER := samsung
diff --git a/matisse-common-vendor.mk b/matisse-common-vendor.mk
index 6f7f02d..056364c 100644
--- a/matisse-common-vendor.mk
+++ b/matisse-common-vendor.mk
@@ -15,6 +15,9 @@
 
 # This file is generated by device/samsung/matisse-common/setup-makefiles.sh
 
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/samsung/matisse-common
+
 PRODUCT_COPY_FILES += \
     vendor/samsung/matisse-common/proprietary/cameradata/datapattern_420sp.yuv:system/cameradata/datapattern_420sp.yuv \
     vendor/samsung/matisse-common/proprietary/cameradata/datapattern_front_420sp.yuv:system/cameradata/datapattern_front_420sp.yuv \
@@ -161,5 +164,4 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/matisse-common/proprietary/vendor/lib/libxml.so:system/vendor/lib/libxml.so
 
 PRODUCT_PACKAGES += \
-    libtime_genoff \
     TimeService
diff --git a/proprietary/vendor/lib/libtime_genoff.so b/proprietary/vendor/lib/libtime_genoff.so
deleted file mode 100644
index 3b9f882..0000000
Binary files a/proprietary/vendor/lib/libtime_genoff.so and /dev/null differ