google_pixel: Rename GoogleExtServices to avoid APEX conflict

Change-Id: I3d23c6a3d6be1537980e55ecfece1cebc8f8ee62
3 years ago · 0bbea3259d
parent 4344b48623
commit 0bbea3259d
4 changed files with 3 additions and 3 deletions
--- 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
--- a/apps/GoogleApps.mk
+++ b/apps/GoogleApps.mk
@ -29,7 +29,7 @@ endif
 ## Core packages
 PRODUCT_PACKAGES += \
-    GoogleExtServices \
+    GoogleExtServicesMobile \
    NexusLauncherRelease \
    PixelSetupWizard \
    PixelSetupWizardOverlay \
--- a/apps/apks/GoogleExtServicesMobile.apk
+++ b/apps/apks/GoogleExtServicesMobile.apk
--- 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