Eleven gapps

From redfin-rq1a.201205.011 * Move everything to product or system_ext * No more maps jar? * Fix sha1sum of arm64 MarkupGoogle/lib/arm64/libsketchology_native.so The file is unchanged, the checksum simply has always been wrong * Adapt to new blueprint based extract utils
2021-01-01 15:37:52 +01:00
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -0,0 +1,56 @@
+/**
+ * Copyright (C) 2019-2021 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/arm/setup-makefiles.sh
+ */
+
+soong_namespace {
+}
+
+android_app_import {
+	name: "PrebuiltGmsCore",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
+android_app_import {
+	name: "MarkupGoogle",
+	owner: "gapps",
+	apk: "proprietary/product/app/MarkupGoogle/MarkupGoogle.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	product_specific: true,
+}
+
+android_app_import {
+	name: "Velvet",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/Velvet/Velvet.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
--- a/arm/Android.mk
+++ b/arm/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2021 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.
@@ -12,47 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/arm/setup-makefiles.sh

 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)
+ifeq ($(TARGET_ARCH),arm)

 endif
-endif
--- a/arm/BoardConfigVendor.mk
+++ b/arm/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2021 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.
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/arm/setup-makefiles.sh

--- a/arm/arm-vendor.mk
+++ b/arm/arm-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2021 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.
@@ -12,16 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/arm/setup-makefiles.sh
+
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/gapps/arm

 PRODUCT_COPY_FILES += \
-    vendor/gapps/arm/proprietary/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so
+    vendor/gapps/arm/proprietary/product/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/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/product/app/MarkupGoogle/lib/arm/libsketchology_native.so:$(TARGET_COPY_OUT_PRODUCT)/app/MarkupGoogle/lib/arm/libsketchology_native.so

 PRODUCT_PACKAGES += \
    MarkupGoogle \
--- a/arm/proprietary/product/app/MarkupGoogle/MarkupGoogle.apk
+++ b/arm/proprietary/product/app/MarkupGoogle/MarkupGoogle.apk
--- a/arm/proprietary/product/app/MarkupGoogle/lib/arm/libsketchology_native.so
+++ b/arm/proprietary/product/app/MarkupGoogle/lib/arm/libsketchology_native.so
--- a/arm/proprietary/product/lib/libjni_latinimegoogle.so
+++ b/arm/proprietary/product/lib/libjni_latinimegoogle.so
--- a/arm/proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
+++ b/arm/proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
--- a/arm/proprietary/product/priv-app/Velvet/Velvet.apk
+++ b/arm/proprietary/product/priv-app/Velvet/Velvet.apk
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -0,0 +1,56 @@
+/**
+ * Copyright (C) 2019-2021 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/arm64/setup-makefiles.sh
+ */
+
+soong_namespace {
+}
+
+android_app_import {
+	name: "PrebuiltGmsCore",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
+android_app_import {
+	name: "MarkupGoogle",
+	owner: "gapps",
+	apk: "proprietary/product/app/MarkupGoogle/MarkupGoogle.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	product_specific: true,
+}
+
+android_app_import {
+	name: "Velvet",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/Velvet/Velvet.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
--- a/arm64/Android.mk
+++ b/arm64/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2021 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.
@@ -12,47 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/arm64/setup-makefiles.sh

 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)
+ifeq ($(TARGET_ARCH),arm64)

 endif
-endif
--- a/arm64/BoardConfigVendor.mk
+++ b/arm64/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2021 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.
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/arm64/setup-makefiles.sh

--- a/arm64/arm64-vendor.mk
+++ b/arm64/arm64-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2021 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.
@@ -12,17 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/arm64/setup-makefiles.sh
+
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/gapps/arm64

 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/product/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/lib/libjni_latinimegoogle.so \
+    vendor/gapps/arm64/proprietary/product/lib64/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/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/product/app/MarkupGoogle/lib/arm64/libsketchology_native.so:$(TARGET_COPY_OUT_PRODUCT)/app/MarkupGoogle/lib/arm64/libsketchology_native.so

 PRODUCT_PACKAGES += \
    MarkupGoogle \
--- a/arm64/proprietary/product/app/MarkupGoogle/MarkupGoogle.apk
+++ b/arm64/proprietary/product/app/MarkupGoogle/MarkupGoogle.apk
--- a/arm64/proprietary/product/app/MarkupGoogle/lib/arm64/libsketchology_native.so
+++ b/arm64/proprietary/product/app/MarkupGoogle/lib/arm64/libsketchology_native.so
--- a/arm64/proprietary/product/lib/libjni_latinimegoogle.so
+++ b/arm64/proprietary/product/lib/libjni_latinimegoogle.so
--- a/arm64/proprietary/product/lib64/libjni_latinimegoogle.so
+++ b/arm64/proprietary/product/lib64/libjni_latinimegoogle.so
--- a/arm64/proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
+++ b/arm64/proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
--- a/arm64/proprietary/product/priv-app/Velvet/Velvet.apk
+++ b/arm64/proprietary/product/priv-app/Velvet/Velvet.apk
--- a/build/gapps.sh
+++ b/build/gapps.sh
@@ -8,7 +8,7 @@
 #
 DATE=$(date -u +%Y%m%d_%H%M%S)
 TOP=$(realpath .)
-ANDROIDV=9.0.0
+ANDROIDV=11.0.0
 GARCH=$1
 OUT=$TOP/out
 BUILD=$TOP/build
--- a/build/meta/com/google/android/update-binary
+++ b/build/meta/com/google/android/update-binary
@@ -93,10 +93,10 @@ NEEDED_STORAGE=`expr $(exec_util "du -s ." | awk '{ print $1 }') + $STORAGE_BUFF

 if [ "$MEM" -lt "$LOWMEM" ] || [ "$STORAGE" -lt "$NEEDED_STORAGE" ]; then
  ui_print "Low resource device detected, removing large extras"
-  exec_util "rm -rf app/MarkupGoogle"
-  exec_util "rm -rf priv-app/AndroidMigratePrebuilt"
-  exec_util "rm -rf priv-app/SetupWizard"
-  exec_util "rm -rf priv-app/Velvet"
+  exec_util "rm -rf product/app/MarkupGoogle"
+  exec_util "rm -rf product/priv-app/AndroidMigratePrebuilt"
+  exec_util "rm -rf product/priv-app/SetupWizardPrebuilt"
+  exec_util "rm -rf product/priv-app/Velvet"
  NEEDED_STORAGE=`expr $(exec_util "du -s ." | awk '{ print $1 }') + $STORAGE_BUFFER`
  if [ "$STORAGE" -lt "$NEEDED_STORAGE" ]; then
    ui_print "Not enough space for GApps! Aborting"
@@ -136,7 +136,7 @@ done
 ui_print "Copying files"
 exec_util "cp --preserve=a -r ./* /system/"
 if [ -e priv-app/SetupWizard ] ; then
-    exec_util "rm -rf /system/priv-app/Provision"
+    exec_util "rm -rf /system/system_ext/priv-app/Provision"
 fi
 ui_print "Cleaning up files"
 cd ../
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -0,0 +1,146 @@
+/**
+ * Copyright (C) 2019-2021 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/common/setup-makefiles.sh
+ */
+
+soong_namespace {
+}
+
+android_app_import {
+	name: "GoogleCalendarSyncAdapter",
+	owner: "gapps",
+	apk: "proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	product_specific: true,
+}
+
+android_app_import {
+	name: "GoogleContactsSyncAdapter",
+	owner: "gapps",
+	apk: "proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	product_specific: true,
+}
+
+android_app_import {
+	name: "PrebuiltExchange3Google",
+	owner: "gapps",
+	apk: "proprietary/product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	product_specific: true,
+}
+
+android_app_import {
+	name: "AndroidAutoStubPrebuilt",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
+android_app_import {
+	name: "PartnerSetupPrebuilt",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/PartnerSetupPrebuilt/PartnerSetupPrebuilt.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
+android_app_import {
+	name: "Phonesky",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/Phonesky/Phonesky.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
+android_app_import {
+	name: "GoogleFeedback",
+	owner: "gapps",
+	apk: "proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "GoogleServicesFramework",
+	owner: "gapps",
+	apk: "proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.google.android.dialer.support",
+	owner: "gapps",
+	jars: ["proprietary/product/framework/com.google.android.dialer.support.jar"],
+	product_specific: true,
+}
+
+android_app_import {
+	name: "AndroidMigratePrebuilt",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
+android_app_import {
+	name: "SetupWizardPrebuilt",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk",
+	overrides: ["Provision"],
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2021 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.
@@ -12,138 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/common/setup-makefiles.sh

 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
--- a/common/BoardConfigVendor.mk
+++ b/common/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2021 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.
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/common/setup-makefiles.sh

--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2021 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.
@@ -12,28 +12,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/common/setup-makefiles.sh
+
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/gapps/common

 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/product/etc/permissions/com.google.android.dialer.support.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.google.android.dialer.support.xml \
+    vendor/gapps/common/proprietary/product/etc/permissions/privapp-permissions-google-p.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-google-p.xml \
+    vendor/gapps/common/proprietary/product/etc/sysconfig/google-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google-hiddenapi-package-whitelist.xml \
+    vendor/gapps/common/proprietary/product/etc/sysconfig/google.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google.xml \
+    vendor/gapps/common/proprietary/product/etc/sysconfig/google_build.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google_build.xml \
+    vendor/gapps/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-se.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-google-se.xml

 PRODUCT_PACKAGES += \
    GoogleCalendarSyncAdapter \
    GoogleContactsSyncAdapter \
    PrebuiltExchange3Google \
-    GoogleFeedback \
-    GooglePartnerSetup \
-    GoogleServicesFramework \
+    AndroidAutoStubPrebuilt \
+    PartnerSetupPrebuilt \
    Phonesky \
-    com.google.android.dialer.support \
-    com.google.android.maps
+    GoogleFeedback \
+    GoogleServicesFramework \
+    com.google.android.dialer.support
+
 ifeq ($(TARGET_IS_GROUPER),)

 PRODUCT_PACKAGES += \
--- a/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
+++ b/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
--- a/common/proprietary/etc/permissions/com.google.android.maps.xml
+++ b/common/proprietary/etc/permissions/com.google.android.maps.xml
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source 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.
-->
-
-<permissions>
-    <library name="com.google.android.maps"
-            file="/product/framework/com.google.android.maps.jar" />
-</permissions>
--- a/common/proprietary/etc/permissions/privapp-permissions-google-p.xml
+++ b/common/proprietary/etc/permissions/privapp-permissions-google-p.xml
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source 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 XML file declares which signature|privileged permissions should be granted to privileged
-applications in /product GMS or Google-branded devices.
-It allows additional grants on top of privapp-permissions-platform.xml
-->
-<permissions>
-
-    <privapp-permissions package="com.google.android.angle">
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.connectivity.metrics">
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>.
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.systemui">
-        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
-        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
-        <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
-        <permission name="android.permission.LOCATION_HARDWARE"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.DUMP"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.yadayada">
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.helprtc">
-        <permission name="android.permission.CAPTURE_VIDEO_OUTPUT"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.betterbug">
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.internal.betterbug">
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.nexuslauncher">
-        <permission name="android.permission.BIND_APPWIDGET"/>
-        <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.pixelmigrate">
-        <permission name="android.permission.BACKUP"/>
-        <permission name="android.permission.MANAGE_USB"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.safetyhub">
-        <permission name="android.permission.CALL_PRIVILEGED"/>
-        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
-        <permission name="android.permission.LOCATION_HARDWARE"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.RECEIVE_EMERGENCY_BROADCAST"/>
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.scone">
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.LOCATION_HARDWARE"/>
-        <permission name="android.permission.MANAGE_USB"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
-        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE"/>
-        <permission name="android.permission.WIFI_SET_DEVICE_MOBILITY_STATE"/>
-        <permission name="android.permission.NETWORK_SCAN"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.wallpaper">
-        <permission name="android.permission.BIND_WALLPAPER"/>
-        <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
-        <permission name="android.permission.READ_WALLPAPER_INTERNAL"/>
-        <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.work.oobconfig">
-        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
-        <permission name="android.permission.DISPATCH_PROVISIONING_MESSAGE"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.MANAGE_CARRIER_OEM_UNLOCK_STATE" />
-        <permission name="android.permission.MASTER_CLEAR"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.as">
-        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
-        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
-        <permission name="android.permission.CAPTURE_MEDIA_OUTPUT"/>
-        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
-        <permission name="android.permission.LOCATION_HARDWARE"/>
-        <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
-        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.MONITOR_DEFAULT_SMS_PACKAGE"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.READ_OEM_UNLOCK_STATE"/>
-        <permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.carrier">
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS" />
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.WRITE_APN_SETTINGS"/>
-        <permission name="com.android.permission.INSTALL_EXISTING_PACKAGES" />
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.carriersetup">
-        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
-        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.WRITE_APN_SETTINGS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.connectivitymonitor">
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.dialer">
-        <permission name="android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK"/>
-        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
-        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
-        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.REGISTER_CONNECTION_MANAGER"/>
-        <permission name="android.permission.STATUS_BAR"/>
-        <permission name="android.permission.STOP_APP_SWITCHES"/>
-        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>
-        <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.euicc">
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.REBOOT"/>
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
-        <permission name="com.android.permission.INSTALL_EXISTING_PACKAGES" />
-        <permission name="com.android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
-        <permission name="com.google.android.permission.USE_GRIL" />
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.euiccpixel">
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.REBOOT"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.grilservice">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.cbrsnetworkmonitor">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.hiddenmenu">
-        <permission name="android.permission.CALL_PRIVILEGED"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.REBOOT"/>
-        <permission name="android.permission.WRITE_APN_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.ims">
-        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.pixel.setupwizard">
-        <permission name="android.permission.CHANGE_CONFIGURATION"/>
-        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.STATUS_BAR"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.storagemanager">
-        <permission name="android.permission.DELETE_PACKAGES"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.USE_RESERVED_DISK"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.tetheringentitlement">
-        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.WRITE_APN_SETTINGS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.volta">
-        <permission name="android.permission.BATTERY_STATS"/>
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.REAL_GET_TASKS"/>
-        <permission name="android.permission.REBOOT"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.wfcactivation">
-        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
-        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_LOGS"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.intelligence.sense">
-        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.LOCATION_HARDWARE"/>
-        <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.oslo">
-        <permission name="android.permission.LOCATION_HARDWARE"/>
-        <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.emergency">
-        <!-- Required to place emergency calls from emergency info screen. -->
-        <permission name="android.permission.CALL_PRIVILEGED"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.breel.wallpapers19">
-        <permission name="android.permission.AMBIENT_WALLPAPER"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.feedback">
-        <permission name="android.permission.READ_LOGS"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-    </privapp-permissions>
-</permissions>
--- a/common/proprietary/etc/permissions/privapp-permissions-google.xml
+++ b/common/proprietary/etc/permissions/privapp-permissions-google.xml
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2017 The Android Open Source 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 XML file declares which signature|privileged permissions should be granted to privileged
-applications in /system on GMS or Google-branded devices.
-It allows additional grants on top of privapp-permissions-platform.xml
-->
-<permissions>
-    <privapp-permissions package="com.google.android.captiveportallogin">
-        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.ext.services">
-        <permission name="android.permission.MONITOR_DEFAULT_SMS_PACKAGE" />
-        <permission name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE" />
-        <permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE" />
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.permissioncontroller">
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS"/>
-        <permission name="android.permission.GET_APP_OPS_STATS"/>
-        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
-        <permission name="android.permission.REQUEST_INCIDENT_REPORT_APPROVAL"/>
-        <permission name="android.permission.APPROVE_INCIDENT_REPORTS"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.packageinstaller">
-        <permission name="android.permission.DELETE_PACKAGES"/>
-        <permission name="android.permission.INSTALL_PACKAGES"/>
-        <permission name="android.permission.USE_RESERVED_DISK"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.networkstack">
-        <permission name="android.permission.ACCESS_NETWORK_CONDITIONS"/>
-        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
-        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
-        <permission name="android.permission.CONTROL_VPN"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
-        <permission name="android.permission.MANAGE_SUBSCRIPTION_PLANS"/>
-        <permission name="android.permission.MANAGE_USB"/>
-        <permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD"/>
-        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
-        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.READ_WIFI_CREDENTIAL"/>
-        <permission name="android.permission.RECEIVE_DATA_ACTIVITY_CHANGE"/>
-        <permission name="android.permission.TETHER_PRIVILEGED"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.tag">
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.documentsui">
-        <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
-    </privapp-permissions>
-
-</permissions>
--- a/common/proprietary/framework/com.google.android.dialer.support.jar
+++ b/common/proprietary/framework/com.google.android.dialer.support.jar
--- a/common/proprietary/framework/com.google.android.maps.jar
+++ b/common/proprietary/framework/com.google.android.maps.jar
--- a/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk
+++ b/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk
--- a/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
+++ b/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
--- a/common/proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
+++ b/common/proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
--- a/common/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk
+++ b/common/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk
--- a/common/proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk
+++ b/common/proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk
--- a/common/proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
+++ b/common/proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
--- a/common/proprietary/product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk
+++ b/common/proprietary/product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk
--- a/common/proprietary/product/etc/permissions/com.google.android.dialer.support.xml
+++ b/common/proprietary/product/etc/permissions/com.google.android.dialer.support.xml
--- a/common/proprietary/product/etc/permissions/privapp-permissions-google-p.xml
+++ b/common/proprietary/product/etc/permissions/privapp-permissions-google-p.xml
@@ -17,21 +17,214 @@

 <!--
 This XML file declares which signature|privileged permissions should be granted to privileged
-applications in /product_services on GMS or Google-branded devices.
+applications in /product GMS or Google-branded devices.
 It allows additional grants on top of privapp-permissions-platform.xml
 -->
 <permissions>

-    <privapp-permissions package="com.android.hotwordenrollment.okgoogle">
-        <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
+    <privapp-permissions package="com.google.android.apps.nbu.files">
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
    </privapp-permissions>

-    <privapp-permissions package="com.android.hotwordenrollment.xgoogle">
-        <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
+    <privapp-permissions package="com.google.android.angle">
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
    </privapp-permissions>

-    <privapp-permissions package="com.android.hotwordenrollment.tgoogle">
-        <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
+    <privapp-permissions package="com.android.connectivity.metrics">
+        <permission name="android.permission.DUMP"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>.
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.helprtc">
+        <permission name="android.permission.CAPTURE_VIDEO_OUTPUT"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.betterbug">
+        <permission name="android.permission.DUMP"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.READ_LOGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.internal.betterbug">
+        <permission name="android.permission.DUMP"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.READ_LOGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.carrier.log">
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.pixelmigrate">
+        <permission name="android.permission.BACKUP"/>
+        <permission name="android.permission.MANAGE_USB"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
+        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.safetyhub">
+        <permission name="android.permission.CALL_PRIVILEGED"/>
+        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
+        <permission name="android.permission.LOCATION_HARDWARE"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.RECEIVE_EMERGENCY_BROADCAST"/>
+        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.scone">
+        <permission name="android.permission.DUMP"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.LOCATION_HARDWARE"/>
+        <permission name="android.permission.MANAGE_USB"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
+        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE"/>
+        <permission name="android.permission.WIFI_SET_DEVICE_MOBILITY_STATE"/>
+        <permission name="android.permission.NETWORK_SCAN"/>
+        <permission name="android.permission.REGISTER_STATS_PULL_ATOM"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.wearables.maestro.companion">
+        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.work.oobconfig">
+        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
+        <permission name="android.permission.DISPATCH_PROVISIONING_MESSAGE"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.MANAGE_CARRIER_OEM_UNLOCK_STATE" />
+        <permission name="android.permission.MASTER_CLEAR"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.as">
+        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
+        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
+        <permission name="android.permission.CAPTURE_MEDIA_OUTPUT"/>
+        <permission name="android.permission.CAPTURE_VOICE_COMMUNICATION_OUTPUT"/>
+        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
+        <permission name="android.permission.EXEMPT_FROM_AUDIO_RECORD_RESTRICTIONS"/>
+        <permission name="android.permission.LOCATION_HARDWARE"/>
+        <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
+        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.MONITOR_DEFAULT_SMS_PACKAGE"/>
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.READ_OEM_UNLOCK_STATE"/>
+        <permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE"/>
+        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
+        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.carrier">
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS" />
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.WRITE_APN_SETTINGS"/>
+        <permission name="com.android.permission.INSTALL_EXISTING_PACKAGES" />
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.carrier.carrierwifi">
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.NETWORK_CARRIER_PROVISIONING"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.dialer">
+        <permission name="android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK"/>
+        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
+        <permission name="android.permission.CAPTURE_VOICE_COMMUNICATION_OUTPUT"/>
+        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
+        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
+        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.REGISTER_CONNECTION_MANAGER"/>
+        <permission name="android.permission.STATUS_BAR"/>
+        <permission name="android.permission.STOP_APP_SWITCHES"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+        <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>
+        <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
+        <permission name="com.google.android.dialer.permission.RECEIVE_RING_STATE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.euicc">
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.REBOOT"/>
+        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
+        <permission name="com.android.permission.INSTALL_EXISTING_PACKAGES" />
+        <permission name="com.android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
+        <permission name="com.google.android.permission.USE_GRIL" />
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.euiccpixel">
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.REBOOT"/>
+        <permission name="android.permission.SECURE_ELEMENT_PRIVILEGED_OPERATION"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.hiddenmenu">
+        <permission name="android.permission.CALL_PRIVILEGED"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.REBOOT"/>
+        <permission name="android.permission.WRITE_APN_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.ims">
+        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.tetheringentitlement">
+        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.TETHER_PRIVILEGED"/>
+        <permission name="android.permission.WRITE_APN_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.wfcactivation">
+        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
+        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_LOGS"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.WRITE_APN_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.intelligence.sense">
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.breel.wallpapers19">
+        <permission name="android.permission.AMBIENT_WALLPAPER"/>
    </privapp-permissions>

    <privapp-permissions package="com.android.vending">
@@ -50,6 +243,8 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.GET_APP_OPS_STATS"/>
        <permission name="android.permission.INSTALL_PACKAGES"/>
        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.LOADER_USAGE_STATS"/>
+        <permission name="android.permission.MANAGE_ROLLBACKS"/>
        <permission name="android.permission.MANAGE_USERS"/>
        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
        <permission name="android.permission.PACKAGE_VERIFICATION_AGENT"/>
@@ -77,16 +272,22 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
        <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
        <permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
        <permission name="android.permission.SCORE_NETWORKS"/>
        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
    </privapp-permissions>

+    <privapp-permissions package="com.google.android.apps.nova.bugreportwrapper">
+        <permission name="android.permission.DUMP"/>
+    </privapp-permissions>
+
    <privapp-permissions package="com.google.android.apps.turbo">
        <permission name="android.permission.ACCESS_AMBIENT_LIGHT_STATS" />
        <permission name="android.permission.BATTERY_STATS" />
        <permission name="android.permission.BRIGHTNESS_SLIDER_USAGE"/>
        <permission name="android.permission.CHANGE_APP_IDLE_STATE"/>
        <permission name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS"/>
+        <permission name="android.permission.DUMP"/>
        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
        <permission name="android.permission.POWER_SAVER"/>
        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
@@ -96,13 +297,17 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.ACCESS_INSTANT_APPS"/>
        <permission name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS"/>
        <permission name="android.permission.CONTROL_DISPLAY_SATURATION"/>
-        <permission name="android.permission.INTERACT_ACROSS_PROFILES"/>
        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.MODIFY_QUIET_MODE"/>
        <permission name="android.permission.OBSERVE_APP_USAGE"/>
        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.READ_DREAM_STATE"/>
+        <permission name="android.permission.READ_WALLPAPER_INTERNAL"/>
+        <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
        <permission name="android.permission.SUSPEND_APPS"/>
+        <permission name="android.permission.WRITE_DREAM_STATE"/>
        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
    </privapp-permissions>

@@ -142,6 +347,8 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.LOCATION_HARDWARE"/>
        <permission name="android.permission.LOCK_DEVICE"/>
        <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>
+        <permission name="android.permission.MANAGE_FACTORY_RESET_PROTECTION" />
+        <permission name="android.permission.MANAGE_ROLLBACKS"/>
        <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
        <permission name="android.permission.MANAGE_SUBSCRIPTION_PLANS"/>
        <permission name="android.permission.MANAGE_USB"/>
@@ -190,10 +397,13 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.CALL_PRIVILEGED"/>
        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
+	<permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
        <permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"/>
+        <permission name="android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS"/>
        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
        <permission name="android.permission.DUMP"/>
+        <permission name="android.permission.ENTER_CAR_MODE_PRIORITIZED"/>
        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
        <permission name="android.permission.LOCATION_HARDWARE"/>
        <permission name="android.permission.MANAGE_USB"/>
@@ -202,7 +412,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.MODIFY_PHONE_STATE"/>
        <permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS"/>
        <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
-        <permission name="android.permission.READ_LOGS"/>
        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
        <permission name="android.permission.READ_WIFI_CREDENTIAL"/>
        <permission name="android.permission.REAL_GET_TASKS"/>
@@ -212,15 +421,16 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.START_TASKS_FROM_RECENTS"/>
        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
        <permission name="android.permission.USER_ACTIVITY"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
    </privapp-permissions>

    <privapp-permissions package="com.google.android.googlequicksearchbox">
        <permission name="android.permission.BIND_APPWIDGET"/>
        <permission name="android.permission.CALL_PRIVILEGED"/>
        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
+        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE" />
+        <permission name="android.permission.ENTER_CAR_MODE_PRIORITIZED" />
        <permission name="android.permission.GLOBAL_SEARCH"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <deny-permission name="android.permission.INTERACT_ACROSS_USERS"/>
        <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
        <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
@@ -235,40 +445,8 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.STATUS_BAR"/>
        <permission name="android.permission.STOP_APP_SWITCHES"/>
        <permission name="com.google.android.permission.SET_WATCH_FACE_PRIVILEGED"/>
+        <permission name="android.permission.WRITE_APN_SETTINGS"/>
    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.gsf">
-        <permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>
-        <permission name="android.permission.BACKUP"/>
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.INVOKE_CARRIER_SETUP"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.MASTER_CLEAR"/>
-        <permission name="android.permission.READ_DREAM_STATE"/>
-        <permission name="android.permission.READ_LOGS"/>
-        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
-        <permission name="android.permission.REBOOT"/>
-        <permission name="android.permission.RECEIVE_DATA_ACTIVITY_CHANGE"/>
-        <permission name="android.permission.RECOVERY"/>
-        <permission name="android.permission.SET_TIME"/>
-        <permission name="android.permission.STATUS_BAR"/>
-        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
-        <permission name="android.permission.WRITE_GSERVICES"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.onetimeinitializer">
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.partnersetup">
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.CHANGE_CONFIGURATION"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-    </privapp-permissions>
-
    <privapp-permissions package="com.google.android.settings.intelligence">
        <permission name="android.permission.MANAGE_FINGERPRINT"/>
        <permission name="android.permission.MODIFY_PHONE_STATE"/>
@@ -288,17 +466,18 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.DISPATCH_PROVISIONING_MESSAGE"/>
        <permission name="android.permission.INVOKE_CARRIER_SETUP"/>
        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
-        <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>
        <permission name="android.permission.MANAGE_FINGERPRINT"/>
        <permission name="android.permission.MANAGE_USB"/>
        <permission name="android.permission.MANAGE_USERS"/>
        <permission name="android.permission.MASTER_CLEAR"/>
+        <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
        <permission name="android.permission.MODIFY_PHONE_STATE"/>
        <permission name="android.permission.NOTIFICATION_DURING_SETUP"/>
        <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
        <permission name="android.permission.PERFORM_CDMA_PROVISIONING"/>
        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
        <permission name="android.permission.REBOOT"/>
+        <permission name="android.permission.REQUEST_NETWORK_SCORES"/>
        <permission name="android.permission.SET_TIME"/>
        <permission name="android.permission.SET_TIME_ZONE"/>
        <permission name="android.permission.SHUTDOWN"/>
@@ -309,4 +488,20 @@ It allows additional grants on top of privapp-permissions-platform.xml
        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
    </privapp-permissions>

+    <privapp-permissions package="com.android.hotwordenrollment.okgoogle">
+        <permission name="android.permission.KEYPHRASE_ENROLLMENT_APPLICATION"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.android.hotwordenrollment.xgoogle">
+        <permission name="android.permission.KEYPHRASE_ENROLLMENT_APPLICATION"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.partnersetup">
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+        <permission name="android.permission.CHANGE_CONFIGURATION"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+    </privapp-permissions>
+
 </permissions>
--- a/common/proprietary/product/etc/sysconfig/google-hiddenapi-package-whitelist.xml
+++ b/common/proprietary/product/etc/sysconfig/google-hiddenapi-package-whitelist.xml
@@ -22,6 +22,7 @@ This XML file declares which platform apps that need to access internal APIs.
  <hidden-api-whitelisted-app package="android.car.cluster.maserati" />
  <hidden-api-whitelisted-app package="com.android.apps.tag" />
  <hidden-api-whitelisted-app package="com.android.auto.embedded.cts.verifier" />
+  <hidden-api-whitelisted-app package="com.android.car.bugreport" />
  <hidden-api-whitelisted-app package="com.android.car.carlauncher" />
  <hidden-api-whitelisted-app package="com.android.car.home" />
  <hidden-api-whitelisted-app package="com.android.car.retaildemo" />
@@ -53,7 +54,6 @@ This XML file declares which platform apps that need to access internal APIs.
  <hidden-api-whitelisted-app package="com.google.android.apps.wallpaper" />
  <hidden-api-whitelisted-app package="com.google.android.asdiv" />
  <hidden-api-whitelisted-app package="com.google.android.athome.globalkeyinterceptor" />
-  <hidden-api-whitelisted-app package="com.google.android.car.bugreport" />
  <hidden-api-whitelisted-app package="com.google.android.car.defaultstoragemonitoringcompanionapp" />
  <hidden-api-whitelisted-app package="com.google.android.car.diagnosticrecorder" />
  <hidden-api-whitelisted-app package="com.google.android.car.diagnosticverifier" />
@@ -87,7 +87,6 @@ This XML file declares which platform apps that need to access internal APIs.
  <hidden-api-whitelisted-app package="com.google.android.setupwizard" />
  <hidden-api-whitelisted-app package="com.google.android.storagemanager" />
  <hidden-api-whitelisted-app package="com.google.android.tag" />
-  <hidden-api-whitelisted-app package="com.google.android.tungsten.overscan" />
  <hidden-api-whitelisted-app package="com.google.android.tungsten.setupwraith" />
  <hidden-api-whitelisted-app package="com.google.android.tv.bugreportsender" />
  <hidden-api-whitelisted-app package="com.google.android.tv.frameworkpackagestubs" />
--- a/common/proprietary/product/etc/sysconfig/google.xml
+++ b/common/proprietary/product/etc/sysconfig/google.xml
@@ -48,6 +48,9 @@
    <!-- If the volta app is pre-installed (for monitoring power use), let it do checkins. -->
    <allow-in-power-save package="com.google.android.volta" />

+    <!-- If GoogleCellBroadcastServiceModule is installed, let it run in the background -->
+    <allow-in-power-save package="com.google.android.cellbroadcastreceiver" />
+
    <!-- If CarrierServices is installed, it must always have network access to
         reliably receive IMS messages. -->
    <allow-in-power-save package="com.google.android.ims" />
@@ -62,7 +65,7 @@
    <app-link package="com.google.android.apps.docs" />
    <app-link package="com.google.android.talk" />
    <app-link package="com.google.android.apps.photos" />
-    <app-link package="com.google.android.music" />
+    <app-link package="com.google.android.apps.youtube.music" />

    <!-- Apps below are optional on GMS devices -->
    <app-link package="com.google.android.apps.tycho" />
@@ -73,6 +76,7 @@
    <app-link package="com.google.android.talk" />
    <app-link package="com.google.android.videos" />
    <app-link package="com.google.android.calendar" />
+    <app-link package="com.google.android.apps.wallpaper" />

    <!-- These are the packages that are white-listed to be able to run as system user -->
    <system-user-whitelisted-app package="com.android.vending" />
@@ -97,10 +101,17 @@
    <!-- Specify the explicit set of other applications that AI services are allowed to
         interact with, including the providers that back the implementation of the APIs
         provided by the package. -->
+    <allow-association target="com.google.android.as" allowed="com.android.bluetooth" />
    <allow-association target="com.google.android.as" allowed="com.android.providers.contacts" />
    <allow-association target="com.google.android.as" allowed="com.android.providers.media" />
    <allow-association target="com.google.android.as" allowed="com.android.providers.telephony" />
    <allow-association target="com.google.android.as" allowed="com.android.systemui" />
-    <allow-association target="com.google.android.as" allowed="com.google.android.gms" />
-    <allow-association target="com.google.android.as" allowed="com.google.android.gsf" />
+    <allow-association target="com.google.android.as" allowed="com.google.android.providers.media.module" />
+
+    <!-- Specify the explicit set of other applications whose app data directories are
+        accessible by other applications. -->
+    <app-data-isolation-whitelisted-app package="com.google.android.gms" />
+
+    <!-- Whitelist of packages that eligible for rollback -->
+    <rollback-whitelisted-app package="com.android.vending" />
 </config>
--- a/common/proprietary/product/etc/sysconfig/google_build.xml
+++ b/common/proprietary/product/etc/sysconfig/google_build.xml
--- a/common/proprietary/product/framework/com.google.android.dialer.support.jar
+++ b/common/proprietary/product/framework/com.google.android.dialer.support.jar
--- a/common/proprietary/product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk
+++ b/common/proprietary/product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk
--- a/common/proprietary/product/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk
+++ b/common/proprietary/product/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk
--- a/common/proprietary/product/priv-app/PartnerSetupPrebuilt/PartnerSetupPrebuilt.apk
+++ b/common/proprietary/product/priv-app/PartnerSetupPrebuilt/PartnerSetupPrebuilt.apk
--- a/common/proprietary/product/priv-app/Phonesky/Phonesky.apk
+++ b/common/proprietary/product/priv-app/Phonesky/Phonesky.apk
--- a/common/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk
+++ b/common/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk
--- a/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-se.xml
+++ b/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-se.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source 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 XML file declares which signature|privileged permissions should be granted to privileged
+applications in /system_ext on GMS or Google-branded devices.
+It allows additional grants on top of privapp-permissions-platform.xml
+-->
+<permissions>
+
+    <privapp-permissions package="com.android.systemui">
+        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
+        <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
+        <permission name="android.permission.LOCATION_HARDWARE"/>
+        <permission name="android.permission.REGISTER_STATS_PULL_ATOM"/>
+        <permission name="android.permission.REQUEST_NETWORK_SCORES"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.android.settings">
+        <permission name="android.permission.INSTALL_DYNAMIC_SYSTEM"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.android.systemui">
+        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
+        <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
+        <permission name="android.permission.LOCATION_HARDWARE"/>
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.REQUEST_NETWORK_SCORES"/>
+        <permission name="android.permission.DUMP"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.storagemanager">
+        <permission name="android.permission.DELETE_PACKAGES"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.USE_RESERVED_DISK"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.volta">
+        <permission name="android.permission.BATTERY_STATS"/>
+        <permission name="android.permission.CHANGE_APP_IDLE_STATE"/>
+        <permission name="android.permission.DUMP"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.QUERY_ALL_PACKAGES"/>
+        <permission name="android.permission.REAL_GET_TASKS"/>
+        <permission name="android.permission.REBOOT"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.nexuslauncher">
+        <permission name="android.permission.BIND_APPWIDGET"/>
+        <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.gsf">
+        <permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>
+        <permission name="android.permission.BACKUP"/>
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+        <permission name="android.permission.DUMP"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.INVOKE_CARRIER_SETUP"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.MASTER_CLEAR"/>
+        <permission name="android.permission.READ_DREAM_STATE"/>
+        <permission name="android.permission.READ_LOGS"/>
+        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
+        <permission name="android.permission.REBOOT"/>
+        <permission name="android.permission.RECEIVE_DATA_ACTIVITY_CHANGE"/>
+        <permission name="android.permission.RECOVERY"/>
+        <permission name="android.permission.SET_TIME"/>
+        <permission name="android.permission.STATUS_BAR"/>
+        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
+        <permission name="android.permission.WRITE_GSERVICES"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.partnersetup">
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+        <permission name="android.permission.CHANGE_CONFIGURATION"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.carriersetup">
+        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.wallpaper">
+        <permission name="android.permission.BIND_WALLPAPER"/>
+        <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
+        <permission name="android.permission.READ_WALLPAPER_INTERNAL"/>
+        <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.feedback">
+        <permission name="android.permission.READ_LOGS"/>
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.onetimeinitializer">
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.android.yadayada">
+        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.pixel.setupwizard">
+        <permission name="android.permission.CHANGE_CONFIGURATION"/>
+        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.STATUS_BAR"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+        <permission name="android.permission.SHUTDOWN"/>
+        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.cbrsnetworkmonitor">
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.grilservice">
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.connectivitymonitor">
+        <permission name="android.permission.DUMP"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.connectivitythermalpowermanager">
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
+        <permission name="android.permission.REGISTER_STATS_PULL_ATOM"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.android.refreshratecontrol">
+        <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.android.hbmsvmanager">
+        <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.oslo">
+        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
+        <permission name="android.permission.LOCATION_HARDWARE"/>
+        <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
+        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.RECORD_AUDIO"/>
+        <permission name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+        <permission name="android.permission.USER_ACTIVITY"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.android.emergency">
+        <!-- Required to place emergency calls from emergency info screen. -->
+        <permission name="android.permission.CALL_PRIVILEGED"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.devicedropmonitor">
+        <permission name="android.permission.ACCESS_CONTEXT_HUB"/>
+        <permission name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.uvexposurereporter">
+        <permission name="android.permission.ACCESS_CONTEXT_HUB"/>
+        <permission name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.iphealthmonitor">
+        <permission name="android.permission.ACCESS_CONTEXT_HUB"/>
+        <permission name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    </privapp-permissions>
+</permissions>
--- a/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk
+++ b/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk
--- a/common/proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
+++ b/common/proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
--- a/proprietary-files-arm-nongrouper.txt
+++ b/proprietary-files-arm-nongrouper.txt
@@ -1,3 +1,3 @@
-app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f
-priv-app/Velvet/Velvet.apk;PRESIGNED|1bd57d7a32d77ec007ca7ad8032cca8d9038c555
-app/MarkupGoogle/lib/arm/libsketchology_native.so|479720ba394500786e5b5a39deb09a93d5bce9db
+-product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f
+-product/priv-app/Velvet/Velvet.apk;PRESIGNED|1bd57d7a32d77ec007ca7ad8032cca8d9038c555
+product/app/MarkupGoogle/lib/arm/libsketchology_native.so|479720ba394500786e5b5a39deb09a93d5bce9db
--- a/proprietary-files-arm.txt
+++ b/proprietary-files-arm.txt
@@ -1,2 +1,2 @@
-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|afd195a1ea4578b353ae03c78488c98151207fec
-lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e
+-product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|afd195a1ea4578b353ae03c78488c98151207fec
+product/lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e
--- a/proprietary-files-arm64-nongrouper.txt
+++ b/proprietary-files-arm64-nongrouper.txt
@@ -1,3 +1,3 @@
-app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f
-priv-app/Velvet/Velvet.apk;PRESIGNED|314043242c4253b61d9d4fcf656489d3fa0265be
-app/MarkupGoogle/lib/arm64/libsketchology_native.so|71898873b8d07af8f0589ac6faf64770300b2e21
+-product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f
+-product/priv-app/Velvet/Velvet.apk;PRESIGNED|314043242c4253b61d9d4fcf656489d3fa0265be
+product/app/MarkupGoogle/lib/arm64/libsketchology_native.so|5c55b4d32beeeca04b4e9f4ce1a2cd3e15a32c8c
--- a/proprietary-files-arm64.txt
+++ b/proprietary-files-arm64.txt
@@ -1,3 +1,3 @@
-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|490ad9c4c40d81159d7b56499acc8bdcc0d195af
-lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e
-lib64/libjni_latinimegoogle.so|84f9b1dc4c1b45f0c5ec9043b99a50c54e58ae1d
+-product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|490ad9c4c40d81159d7b56499acc8bdcc0d195af
+product/lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e
+product/lib64/libjni_latinimegoogle.so|84f9b1dc4c1b45f0c5ec9043b99a50c54e58ae1d
--- a/proprietary-files-common-nongrouper.txt
+++ b/proprietary-files-common-nongrouper.txt
@@ -1,2 +1,2 @@
-priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk;PRESIGNED|eb965010832814a84afc32db11bf1c89586b78bc
-priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED
+-product/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk;PRESIGNED|eb965010832814a84afc32db11bf1c89586b78bc
+-product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED
--- a/proprietary-files-common.txt
+++ b/proprietary-files-common.txt
@@ -1,21 +1,21 @@
-app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk;PRESIGNED|aa482580c87a43c83882c05a4757754917d47f32
-app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk;PRESIGNED
-app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk;PRESIGNED|043cb74798bf137d2dd1a69c7bca0a6702ad88a2
+-product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk;PRESIGNED|aa482580c87a43c83882c05a4757754917d47f32
+-product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk;PRESIGNED
+-product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk;PRESIGNED|043cb74798bf137d2dd1a69c7bca0a6702ad88a2

-priv-app/GoogleFeedback/GoogleFeedback.apk;PRESIGNED
-priv-app/GooglePartnerSetup/GooglePartnerSetup.apk;PRESIGNED
-priv-app/GoogleServicesFramework/GoogleServicesFramework.apk;PRESIGNED
-priv-app/Phonesky/Phonesky.apk;PRESIGNED
+-product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk;PRESIGNED
+-product/priv-app/PartnerSetupPrebuilt/PartnerSetupPrebuilt.apk;PRESIGNED
+-product/priv-app/Phonesky/Phonesky.apk;PRESIGNED

-framework/com.google.android.maps.jar;PRESIGNED
-framework/com.google.android.dialer.support.jar;PRESIGNED
+-product/framework/com.google.android.dialer.support.jar;PRESIGNED

-etc/permissions/com.google.android.maps.xml
-etc/permissions/com.google.android.dialer.support.xml
-etc/permissions/privapp-permissions-google.xml
-etc/permissions/privapp-permissions-google-p.xml
-etc/permissions/privapp-permissions-google-ps.xml
+product/etc/permissions/com.google.android.dialer.support.xml
+product/etc/permissions/privapp-permissions-google-p.xml

-etc/sysconfig/google-hiddenapi-package-whitelist.xml
-etc/sysconfig/google.xml
-etc/sysconfig/google_build.xml
+product/etc/sysconfig/google-hiddenapi-package-whitelist.xml
+product/etc/sysconfig/google.xml
+product/etc/sysconfig/google_build.xml
+
+-system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk;PRESIGNED
+-system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk;PRESIGNED
+
+system_ext/etc/permissions/privapp-permissions-google-se.xml
--- a/proprietary-files-x86-nongrouper.txt
+++ b/proprietary-files-x86-nongrouper.txt
@@ -1 +1 @@
-priv-app/Velvet/Velvet.apk;PRESIGNED|cd13e9ea9d5b3337b8a22b9ea7939132458cbced
+-product/priv-app/Velvet/Velvet.apk;PRESIGNED|cd13e9ea9d5b3337b8a22b9ea7939132458cbced
--- a/proprietary-files-x86.txt
+++ b/proprietary-files-x86.txt
@@ -1,2 +1,2 @@
-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|e3963b9548dc8b50674a11b937c9af6e00c652e6
-lib/libjni_latinimegoogle.so|5e1e142c1ff8dcd97c9574f90d613c878bde0e79
+-product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|e3963b9548dc8b50674a11b937c9af6e00c652e6
+product/lib/libjni_latinimegoogle.so|5e1e142c1ff8dcd97c9574f90d613c878bde0e79
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -20,7 +20,7 @@ set -e

 export INITIAL_COPYRIGHT_YEAR=2017

-export GAPPS_COMMON=common
+export DEVICE_COMMON=common
 export VENDOR=gapps

 # Load extract_utils and do some sanity checks
@@ -37,7 +37,7 @@ fi
 . "$HELPER"

 # Initialize the helper for common gapps
-setup_vendor "$GAPPS_COMMON" "$VENDOR" "$LINEAGE_ROOT" true
+setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true

 # Copyright headers
 write_headers "arm arm64 x86"
@@ -46,36 +46,34 @@ write_headers "arm arm64 x86"
 write_makefiles "$MY_DIR"/proprietary-files-common.txt

 # Gapps that are too large for grouper
+printf "\n" >> "$PRODUCTMK"
 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

-for TARGET in arm arm64 x86; do
+for DEVICE in arm arm64 x86; do

 # Reinitialize the helper for target gapps
-setup_vendor "$TARGET" "$VENDOR" "$LINEAGE_ROOT" true
+setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT"

 # Copyright headers and guards
-write_headers "$TARGET"
+write_headers "$DEVICE"

-write_makefiles "$MY_DIR"/proprietary-files-$TARGET.txt
+write_makefiles "$MY_DIR"/proprietary-files-$DEVICE.txt

 # Gapps that are too large for grouper
+printf "\n" >> "$PRODUCTMK"
 echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$PRODUCTMK"
-echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$ANDROIDMK"
-write_makefiles "$MY_DIR"/proprietary-files-$TARGET-nongrouper.txt
+write_makefiles "$MY_DIR"/proprietary-files-$DEVICE-nongrouper.txt
 echo "endif" >> "$PRODUCTMK"
-echo "endif" >> "$ANDROIDMK"

 printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)" >> "$PRODUCTMK"

--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -0,0 +1,45 @@
+/**
+ * Copyright (C) 2019-2021 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/x86/setup-makefiles.sh
+ */
+
+soong_namespace {
+}
+
+android_app_import {
+	name: "PrebuiltGmsCore",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
+android_app_import {
+	name: "Velvet",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/Velvet/Velvet.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
--- a/x86/Android.mk
+++ b/x86/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2021 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.
@@ -12,36 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/x86/setup-makefiles.sh

 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)
+ifeq ($(TARGET_ARCH),x86)

 endif
-endif
--- a/x86/BoardConfigVendor.mk
+++ b/x86/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2021 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.
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/x86/setup-makefiles.sh

--- a/x86/proprietary/product/lib/libjni_latinimegoogle.so
+++ b/x86/proprietary/product/lib/libjni_latinimegoogle.so
--- a/x86/proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
+++ b/x86/proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
--- a/x86/proprietary/product/priv-app/Velvet/Velvet.apk
+++ b/x86/proprietary/product/priv-app/Velvet/Velvet.apk
--- a/x86/x86-vendor.mk
+++ b/x86/x86-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2021 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.
@@ -12,13 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# This file is generated by device/gapps//setup-makefiles.sh
+# This file is generated by device/gapps/x86/setup-makefiles.sh
+
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/gapps/x86

 PRODUCT_COPY_FILES += \
-    vendor/gapps/x86/proprietary/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so
+    vendor/gapps/x86/proprietary/product/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/lib/libjni_latinimegoogle.so

 PRODUCT_PACKAGES += \
    PrebuiltGmsCore
+
 ifeq ($(TARGET_IS_GROUPER),)

 PRODUCT_PACKAGES += \