From 0bbea3259dbc45533bf70607ed2b509b12a30026 Mon Sep 17 00:00:00 2001 From: Nolen Johnson Date: Tue, 1 Mar 2022 17:58:04 -0500 Subject: [PATCH] google_pixel: Rename GoogleExtServices to avoid APEX conflict Change-Id: I3d23c6a3d6be1537980e55ecfece1cebc8f8ee62 --- apps/Android.mk | 2 +- apps/GoogleApps.mk | 2 +- ...eExtServices.apk => GoogleExtServicesMobile.apk} | Bin product.mk | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename apps/apks/{GoogleExtServices.apk => GoogleExtServicesMobile.apk} (100%) diff --git a/apps/Android.mk b/apps/Android.mk index 1156e8a..43b1778 100644 --- a/apps/Android.mk +++ b/apps/Android.mk @@ -27,7 +27,7 @@ LOCAL_PRODUCT_MODULE := true include $(BUILD_PREBUILT) include $(CLEAR_VARS) -LOCAL_MODULE := GoogleExtServices +LOCAL_MODULE := GoogleExtServicesMobile LOCAL_MODULE_OWNER := google LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := APPS diff --git a/apps/GoogleApps.mk b/apps/GoogleApps.mk index 746e13b..ef051a2 100644 --- a/apps/GoogleApps.mk +++ b/apps/GoogleApps.mk @@ -29,7 +29,7 @@ endif ## Core packages PRODUCT_PACKAGES += \ - GoogleExtServices \ + GoogleExtServicesMobile \ NexusLauncherRelease \ PixelSetupWizard \ PixelSetupWizardOverlay \ diff --git a/apps/apks/GoogleExtServices.apk b/apps/apks/GoogleExtServicesMobile.apk similarity index 100% rename from apps/apks/GoogleExtServices.apk rename to apps/apks/GoogleExtServicesMobile.apk diff --git a/product.mk b/product.mk index 773624d..5e61ced 100644 --- a/product.mk +++ b/product.mk @@ -40,5 +40,5 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ system/app/SoundPickerPrebuilt/SoundPickerPrebuilt.apk \ system/etc/permissions/privapp-permissions-pixel-s.xml \ system/etc/permissions/privapp-permissions-pixel.xml \ - system/priv-app/GoogleExtServices/GoogleExtServices.apk + system/priv-app/GoogleExtServicesMobile/GoogleExtServicesMobile.apk