diff --git a/arm/Android.bp b/arm/Android.bp
new file mode 100644
index 0000000..abdb7e0
--- /dev/null
+++ b/arm/Android.bp
@@ -0,0 +1,53 @@
+/**
+ * Copyright (C) 2019-2022 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/gapps//setup-makefiles.sh
+ */
+
+soong_namespace {
+}
+
+android_app_import {
+	name: "PrebuiltGmsCore",
+	owner: "gapps",
+	apk: "proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+}
+
+android_app_import {
+	name: "MarkupGoogle",
+	owner: "gapps",
+	apk: "proprietary/app/MarkupGoogle/MarkupGoogle.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+}
+
+android_app_import {
+	name: "Velvet",
+	owner: "gapps",
+	apk: "proprietary/priv-app/Velvet/Velvet.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+}
+
diff --git a/arm/Android.mk b/arm/Android.mk
index 1547094..95d36bb 100644
--- a/arm/Android.mk
+++ b/arm/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2022 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.
@@ -18,41 +18,4 @@ LOCAL_PATH := $(call my-dir)
 
 ifneq ($(filter arm,$(TARGET_ARCH)),)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := PrebuiltGmsCore
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
-ifeq ($(TARGET_IS_GROUPER),)
-include $(CLEAR_VARS)
-LOCAL_MODULE := MarkupGoogle
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/app/MarkupGoogle/MarkupGoogle.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := Velvet
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/priv-app/Velvet/Velvet.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
-endif
 endif
diff --git a/arm/BoardConfigVendor.mk b/arm/BoardConfigVendor.mk
index 488d2ea..37b5c98 100644
--- a/arm/BoardConfigVendor.mk
+++ b/arm/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2022 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.
diff --git a/arm/arm-vendor.mk b/arm/arm-vendor.mk
index 339a7b9..9313763 100644
--- a/arm/arm-vendor.mk
+++ b/arm/arm-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2022 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.
@@ -14,14 +14,17 @@
 
 # This file is generated by device/gapps//setup-makefiles.sh
 
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/gapps/
+
 PRODUCT_COPY_FILES += \
-    vendor/gapps/arm/proprietary/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so
+    vendor/gapps/arm/proprietary/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libjni_latinimegoogle.so
 
 PRODUCT_PACKAGES += \
     PrebuiltGmsCore
 ifeq ($(TARGET_IS_GROUPER),)
 PRODUCT_COPY_FILES += \
-    vendor/gapps/arm/proprietary/app/MarkupGoogle/lib/arm/libsketchology_native.so:system/app/MarkupGoogle/lib/arm/libsketchology_native.so
+    vendor/gapps/arm/proprietary/app/MarkupGoogle/lib/arm/libsketchology_native.so:$(TARGET_COPY_OUT_SYSTEM)/app/MarkupGoogle/lib/arm/libsketchology_native.so
 
 PRODUCT_PACKAGES += \
     MarkupGoogle \
diff --git a/arm64/Android.bp b/arm64/Android.bp
new file mode 100644
index 0000000..abdb7e0
--- /dev/null
+++ b/arm64/Android.bp
@@ -0,0 +1,53 @@
+/**
+ * Copyright (C) 2019-2022 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/gapps//setup-makefiles.sh
+ */
+
+soong_namespace {
+}
+
+android_app_import {
+	name: "PrebuiltGmsCore",
+	owner: "gapps",
+	apk: "proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+}
+
+android_app_import {
+	name: "MarkupGoogle",
+	owner: "gapps",
+	apk: "proprietary/app/MarkupGoogle/MarkupGoogle.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+}
+
+android_app_import {
+	name: "Velvet",
+	owner: "gapps",
+	apk: "proprietary/priv-app/Velvet/Velvet.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+}
+
diff --git a/arm64/Android.mk b/arm64/Android.mk
index b410af4..8778282 100644
--- a/arm64/Android.mk
+++ b/arm64/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2022 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.
@@ -18,41 +18,4 @@ LOCAL_PATH := $(call my-dir)
 
 ifneq ($(filter arm64,$(TARGET_ARCH)),)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := PrebuiltGmsCore
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
-ifeq ($(TARGET_IS_GROUPER),)
-include $(CLEAR_VARS)
-LOCAL_MODULE := MarkupGoogle
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/app/MarkupGoogle/MarkupGoogle.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := Velvet
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/priv-app/Velvet/Velvet.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
-endif
 endif
diff --git a/arm64/BoardConfigVendor.mk b/arm64/BoardConfigVendor.mk
index 488d2ea..37b5c98 100644
--- a/arm64/BoardConfigVendor.mk
+++ b/arm64/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2022 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.
diff --git a/arm64/arm64-vendor.mk b/arm64/arm64-vendor.mk
index 771f87b..7c7bbae 100644
--- a/arm64/arm64-vendor.mk
+++ b/arm64/arm64-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2022 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.
@@ -14,15 +14,18 @@
 
 # This file is generated by device/gapps//setup-makefiles.sh
 
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/gapps/
+
 PRODUCT_COPY_FILES += \
-    vendor/gapps/arm64/proprietary/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so \
-    vendor/gapps/arm64/proprietary/lib64/libjni_latinimegoogle.so:system/lib64/libjni_latinimegoogle.so
+    vendor/gapps/arm64/proprietary/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libjni_latinimegoogle.so \
+    vendor/gapps/arm64/proprietary/lib64/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libjni_latinimegoogle.so
 
 PRODUCT_PACKAGES += \
     PrebuiltGmsCore
 ifeq ($(TARGET_IS_GROUPER),)
 PRODUCT_COPY_FILES += \
-    vendor/gapps/arm64/proprietary/app/MarkupGoogle/lib/arm64/libsketchology_native.so:system/app/MarkupGoogle/lib/arm64/libsketchology_native.so
+    vendor/gapps/arm64/proprietary/app/MarkupGoogle/lib/arm64/libsketchology_native.so:$(TARGET_COPY_OUT_SYSTEM)/app/MarkupGoogle/lib/arm64/libsketchology_native.so
 
 PRODUCT_PACKAGES += \
     MarkupGoogle \
diff --git a/common/Android.bp b/common/Android.bp
new file mode 100644
index 0000000..c60a667
--- /dev/null
+++ b/common/Android.bp
@@ -0,0 +1,130 @@
+/**
+ * Copyright (C) 2019-2022 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/gapps//setup-makefiles.sh
+ */
+
+soong_namespace {
+}
+
+android_app_import {
+	name: "GoogleCalendarSyncAdapter",
+	owner: "gapps",
+	apk: "proprietary/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+}
+
+android_app_import {
+	name: "GoogleContactsSyncAdapter",
+	owner: "gapps",
+	apk: "proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+}
+
+android_app_import {
+	name: "PrebuiltExchange3Google",
+	owner: "gapps",
+	apk: "proprietary/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+}
+
+android_app_import {
+	name: "GoogleFeedback",
+	owner: "gapps",
+	apk: "proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+}
+
+android_app_import {
+	name: "GooglePartnerSetup",
+	owner: "gapps",
+	apk: "proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+}
+
+android_app_import {
+	name: "GoogleServicesFramework",
+	owner: "gapps",
+	apk: "proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+}
+
+android_app_import {
+	name: "Phonesky",
+	owner: "gapps",
+	apk: "proprietary/priv-app/Phonesky/Phonesky.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+}
+
+dex_import {
+	name: "com.google.android.dialer.support",
+	owner: "gapps",
+	jars: ["proprietary/framework/com.google.android.dialer.support.jar"],
+}
+
+dex_import {
+	name: "com.google.android.maps",
+	owner: "gapps",
+	jars: ["proprietary/framework/com.google.android.maps.jar"],
+}
+
+android_app_import {
+	name: "AndroidMigratePrebuilt",
+	owner: "gapps",
+	apk: "proprietary/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+}
+
+android_app_import {
+	name: "SetupWizardPrebuilt",
+	owner: "gapps",
+	apk: "proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk",
+	overrides: ["Provision"],
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+}
+
diff --git a/common/Android.mk b/common/Android.mk
index df9da0e..620b791 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2022 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.
@@ -18,132 +18,4 @@ LOCAL_PATH := $(call my-dir)
 
 ifneq ($(filter arm arm64 x86,$(TARGET_ARCH)),)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := GoogleCalendarSyncAdapter
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := GoogleContactsSyncAdapter
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := PrebuiltExchange3Google
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := GoogleFeedback
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := GooglePartnerSetup
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := GoogleServicesFramework
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := Phonesky
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/priv-app/Phonesky/Phonesky.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.google.android.dialer.support
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/framework/com.google.android.dialer.support.jar
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_MODULE_SUFFIX := .jar
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.google.android.maps
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/framework/com.google.android.maps.jar
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_MODULE_SUFFIX := .jar
-include $(BUILD_PREBUILT)
-
-ifeq ($(TARGET_IS_GROUPER),)
-include $(CLEAR_VARS)
-LOCAL_MODULE := AndroidMigratePrebuilt
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := SetupWizardPrebuilt
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk
-LOCAL_OVERRIDES_PACKAGES := Provision
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
-endif
 endif
diff --git a/common/BoardConfigVendor.mk b/common/BoardConfigVendor.mk
index 488d2ea..37b5c98 100644
--- a/common/BoardConfigVendor.mk
+++ b/common/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2022 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.
diff --git a/common/common-vendor.mk b/common/common-vendor.mk
index 0acbf36..f9a0553 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2022 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.
@@ -14,15 +14,18 @@
 
 # This file is generated by device/gapps//setup-makefiles.sh
 
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/gapps/
+
 PRODUCT_COPY_FILES += \
-    vendor/gapps/common/proprietary/etc/permissions/com.google.android.dialer.support.xml:system/etc/permissions/com.google.android.dialer.support.xml \
-    vendor/gapps/common/proprietary/etc/permissions/com.google.android.maps.xml:system/etc/permissions/com.google.android.maps.xml \
-    vendor/gapps/common/proprietary/etc/permissions/privapp-permissions-google-p.xml:system/etc/permissions/privapp-permissions-google-p.xml \
-    vendor/gapps/common/proprietary/etc/permissions/privapp-permissions-google-ps.xml:system/etc/permissions/privapp-permissions-google-ps.xml \
-    vendor/gapps/common/proprietary/etc/permissions/privapp-permissions-google.xml:system/etc/permissions/privapp-permissions-google.xml \
-    vendor/gapps/common/proprietary/etc/sysconfig/google-hiddenapi-package-whitelist.xml:system/etc/sysconfig/google-hiddenapi-package-whitelist.xml \
-    vendor/gapps/common/proprietary/etc/sysconfig/google.xml:system/etc/sysconfig/google.xml \
-    vendor/gapps/common/proprietary/etc/sysconfig/google_build.xml:system/etc/sysconfig/google_build.xml
+    vendor/gapps/common/proprietary/etc/permissions/com.google.android.dialer.support.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.google.android.dialer.support.xml \
+    vendor/gapps/common/proprietary/etc/permissions/com.google.android.maps.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.google.android.maps.xml \
+    vendor/gapps/common/proprietary/etc/permissions/privapp-permissions-google-p.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-google-p.xml \
+    vendor/gapps/common/proprietary/etc/permissions/privapp-permissions-google-ps.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-google-ps.xml \
+    vendor/gapps/common/proprietary/etc/permissions/privapp-permissions-google.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-google.xml \
+    vendor/gapps/common/proprietary/etc/sysconfig/google-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/google-hiddenapi-package-whitelist.xml \
+    vendor/gapps/common/proprietary/etc/sysconfig/google.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/google.xml \
+    vendor/gapps/common/proprietary/etc/sysconfig/google_build.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/google_build.xml
 
 PRODUCT_PACKAGES += \
     GoogleCalendarSyncAdapter \
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 7736e22..4948b22 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -47,15 +47,13 @@ write_makefiles "$MY_DIR"/proprietary-files-common.txt
 
 # Gapps that are too large for grouper
 echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$PRODUCTMK"
-echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$ANDROIDMK"
 write_makefiles "$MY_DIR"/proprietary-files-common-nongrouper.txt
 echo "endif" >> "$PRODUCTMK"
-echo "endif" >> "$ANDROIDMK"
 
 sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
 
 # Make Google SuW override Provision
-sed -i 's/\(SetupWizardPrebuilt.apk\)/\1\nLOCAL_OVERRIDES_PACKAGES := Provision/' "$ANDROIDMK"
+sed -i 's/\(SetupWizardPrebuilt.apk",\)/\1\n\toverrides: ["Provision"],/' "$ANDROIDBP"
 
 # We are done with common
 write_footers
@@ -72,10 +70,8 @@ write_makefiles "$MY_DIR"/proprietary-files-$TARGET.txt
 
 # Gapps that are too large for grouper
 echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$PRODUCTMK"
-echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$ANDROIDMK"
 write_makefiles "$MY_DIR"/proprietary-files-$TARGET-nongrouper.txt
 echo "endif" >> "$PRODUCTMK"
-echo "endif" >> "$ANDROIDMK"
 
 printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)" >> "$PRODUCTMK"
 
diff --git a/x86/Android.bp b/x86/Android.bp
new file mode 100644
index 0000000..66401e9
--- /dev/null
+++ b/x86/Android.bp
@@ -0,0 +1,43 @@
+/**
+ * Copyright (C) 2019-2022 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/gapps//setup-makefiles.sh
+ */
+
+soong_namespace {
+}
+
+android_app_import {
+	name: "PrebuiltGmsCore",
+	owner: "gapps",
+	apk: "proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+}
+
+android_app_import {
+	name: "Velvet",
+	owner: "gapps",
+	apk: "proprietary/priv-app/Velvet/Velvet.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+}
+
diff --git a/x86/Android.mk b/x86/Android.mk
index fd2a5ab..49c500c 100644
--- a/x86/Android.mk
+++ b/x86/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2022 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.
@@ -18,30 +18,4 @@ LOCAL_PATH := $(call my-dir)
 
 ifneq ($(filter x86,$(TARGET_ARCH)),)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := PrebuiltGmsCore
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
-ifeq ($(TARGET_IS_GROUPER),)
-include $(CLEAR_VARS)
-LOCAL_MODULE := Velvet
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/priv-app/Velvet/Velvet.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
-endif
 endif
diff --git a/x86/BoardConfigVendor.mk b/x86/BoardConfigVendor.mk
index 488d2ea..37b5c98 100644
--- a/x86/BoardConfigVendor.mk
+++ b/x86/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2022 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.
diff --git a/x86/x86-vendor.mk b/x86/x86-vendor.mk
index da8ecf3..d8c73bc 100644
--- a/x86/x86-vendor.mk
+++ b/x86/x86-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2022 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.
@@ -14,8 +14,11 @@
 
 # This file is generated by device/gapps//setup-makefiles.sh
 
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/gapps/
+
 PRODUCT_COPY_FILES += \
-    vendor/gapps/x86/proprietary/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so
+    vendor/gapps/x86/proprietary/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libjni_latinimegoogle.so
 
 PRODUCT_PACKAGES += \
     PrebuiltGmsCore