diff --git a/gms_full.mk b/gms_full.mk index ed42634..b184d9e 100644 --- a/gms_full.mk +++ b/gms_full.mk @@ -58,12 +58,12 @@ PRODUCT_PACKAGES += \ talkback # product/priv-app -ifneq ($(filter sailfish marlin walleye taimen blueline crosshatch sargo bonito flame coral sunfish bramble redfin barbet oriole raven bluejay panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet frankel blazer mustang, $(LINEAGE_BUILD)),) +ifneq ($(filter sailfish marlin walleye taimen blueline crosshatch sargo bonito flame coral sunfish bramble redfin barbet oriole raven bluejay panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet tegu frankel blazer mustang, $(LINEAGE_BUILD)),) PRODUCT_PACKAGES += \ SCONE endif -ifneq ($(filter flame coral redfin oriole raven panther cheetah lynx felix shiba husky akita tokay caiman komodo frankel blazer mustang, $(LINEAGE_BUILD)),) +ifneq ($(filter flame coral redfin oriole raven panther cheetah lynx felix shiba husky akita tokay caiman komodo tegu frankel blazer mustang, $(LINEAGE_BUILD)),) PRODUCT_PACKAGES += \ DreamlinerDreamsPrebuilt \ DreamlinerPrebuilt \ @@ -133,7 +133,7 @@ PRODUCT_PACKAGES += \ Flipendo # system_ext/priv-app -ifneq ($(filter sailfish marlin walleye taimen blueline crosshatch sargo bonito flame coral sunfish bramble redfin barbet oriole raven bluejay panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet frankel blazer mustang, $(LINEAGE_BUILD)),) +ifneq ($(filter sailfish marlin walleye taimen blueline crosshatch sargo bonito flame coral sunfish bramble redfin barbet oriole raven bluejay panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet tegu frankel blazer mustang, $(LINEAGE_BUILD)),) PRODUCT_PACKAGES += \ DeviceConnectivityServicePrebuilt_25.01.00 endif diff --git a/gms_full_tablet_wifionly.mk b/gms_full_tablet_wifionly.mk index 9f06e52..3bfbd3b 100644 --- a/gms_full_tablet_wifionly.mk +++ b/gms_full_tablet_wifionly.mk @@ -95,7 +95,7 @@ PRODUCT_PACKAGES += \ WellbeingPrebuilt # product/priv-app -ifneq ($(filter sailfish marlin walleye taimen blueline crosshatch sargo bonito flame coral sunfish bramble redfin barbet oriole raven bluejay panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet frankel blazer mustang, $(LINEAGE_BUILD)),) +ifneq ($(filter sailfish marlin walleye taimen blueline crosshatch sargo bonito flame coral sunfish bramble redfin barbet oriole raven bluejay panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet tegu frankel blazer mustang, $(LINEAGE_BUILD)),) PRODUCT_PACKAGES += \ SCONE endif @@ -131,7 +131,7 @@ PRODUCT_PACKAGES += \ WallpaperPickerGoogleRelease # system_ext/priv-app -ifneq ($(filter sailfish marlin walleye taimen blueline crosshatch sargo bonito flame coral sunfish bramble redfin barbet oriole raven bluejay panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet frankel blazer mustang, $(LINEAGE_BUILD)),) +ifneq ($(filter sailfish marlin walleye taimen blueline crosshatch sargo bonito flame coral sunfish bramble redfin barbet oriole raven bluejay panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet tegu frankel blazer mustang, $(LINEAGE_BUILD)),) PRODUCT_PACKAGES += \ DeviceConnectivityServicePrebuilt_25.01.00 endif diff --git a/gms_mini.mk b/gms_mini.mk index ce8add7..3c76fc4 100644 --- a/gms_mini.mk +++ b/gms_mini.mk @@ -73,12 +73,12 @@ PRODUCT_PACKAGES += \ WellbeingPrebuilt # product/priv-app -ifneq ($(filter sailfish marlin walleye taimen blueline crosshatch sargo bonito flame coral sunfish bramble redfin barbet oriole raven bluejay panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet frankel blazer mustang, $(LINEAGE_BUILD)),) +ifneq ($(filter sailfish marlin walleye taimen blueline crosshatch sargo bonito flame coral sunfish bramble redfin barbet oriole raven bluejay panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet tegu frankel blazer mustang, $(LINEAGE_BUILD)),) PRODUCT_PACKAGES += \ SCONE endif -ifneq ($(filter flame coral redfin oriole raven panther cheetah lynx felix shiba husky akita tokay caiman komodo frankel blazer mustang, $(LINEAGE_BUILD)),) +ifneq ($(filter flame coral redfin oriole raven panther cheetah lynx felix shiba husky akita tokay caiman komodo tegu frankel blazer mustang, $(LINEAGE_BUILD)),) PRODUCT_PACKAGES += \ DreamlinerDreamsPrebuilt \ DreamlinerPrebuilt \ diff --git a/gms_pico.mk b/gms_pico.mk index 018dde0..2d9fd0f 100644 --- a/gms_pico.mk +++ b/gms_pico.mk @@ -66,12 +66,12 @@ PRODUCT_PACKAGES += \ WellbeingPrebuilt # product/priv-app -ifneq ($(filter sailfish marlin walleye taimen blueline crosshatch sargo bonito flame coral sunfish bramble redfin barbet oriole raven bluejay panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet frankel blazer mustang, $(LINEAGE_BUILD)),) +ifneq ($(filter sailfish marlin walleye taimen blueline crosshatch sargo bonito flame coral sunfish bramble redfin barbet oriole raven bluejay panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet tegu frankel blazer mustang, $(LINEAGE_BUILD)),) PRODUCT_PACKAGES += \ SCONE endif -ifneq ($(filter flame coral redfin oriole raven panther cheetah lynx felix shiba husky akita tokay caiman komodo frankel blazer mustang, $(LINEAGE_BUILD)),) +ifneq ($(filter flame coral redfin oriole raven panther cheetah lynx felix shiba husky akita tokay caiman komodo tegu frankel blazer mustang, $(LINEAGE_BUILD)),) PRODUCT_PACKAGES += \ DreamlinerDreamsPrebuilt \ DreamlinerPrebuilt \ diff --git a/product/blobs/etc/permissions/Android.bp b/product/blobs/etc/permissions/Android.bp index 3fa616b..feeb973 100644 --- a/product/blobs/etc/permissions/Android.bp +++ b/product/blobs/etc/permissions/Android.bp @@ -86,6 +86,14 @@ prebuilt_etc { filename_from_src: true, } +prebuilt_etc { + name: "com.google.android.apps.pixel.familyspace", + product_specific: true, + sub_dir: "permissions", + src: "com.google.android.apps.pixel.familyspace.xml", + filename_from_src: true, +} + prebuilt_etc { name: "com.google.android.apps.setupwizard.searchselector", product_specific: true, diff --git a/product/blobs/etc/permissions/com.google.android.apps.pixel.familyspace.xml b/product/blobs/etc/permissions/com.google.android.apps.pixel.familyspace.xml new file mode 100644 index 0000000..ce18561 --- /dev/null +++ b/product/blobs/etc/permissions/com.google.android.apps.pixel.familyspace.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/product/blobs/etc/permissions/privapp-permissions-google-p.xml b/product/blobs/etc/permissions/privapp-permissions-google-p.xml index 1a5ca01..99788d6 100644 --- a/product/blobs/etc/permissions/privapp-permissions-google-p.xml +++ b/product/blobs/etc/permissions/privapp-permissions-google-p.xml @@ -99,6 +99,9 @@ It allows additional grants on top of privapp-permissions-platform.xml + + + @@ -125,6 +128,14 @@ It allows additional grants on top of privapp-permissions-platform.xml + + + + + + + + @@ -171,6 +182,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -196,6 +208,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -230,6 +243,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -368,6 +382,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -408,6 +423,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -496,6 +512,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -532,6 +549,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -559,6 +577,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -607,7 +626,7 @@ It allows additional grants on top of privapp-permissions-platform.xml - + @@ -690,6 +709,8 @@ It allows additional grants on top of privapp-permissions-platform.xml + + @@ -760,6 +781,10 @@ It allows additional grants on top of privapp-permissions-platform.xml + + + + @@ -797,6 +822,8 @@ It allows additional grants on top of privapp-permissions-platform.xml + + @@ -879,6 +906,28 @@ It allows additional grants on top of privapp-permissions-platform.xml + + + + + + + + + + + + + + + + + + + + + + @@ -915,5 +964,11 @@ It allows additional grants on top of privapp-permissions-platform.xml + + + + + + diff --git a/product/blobs/etc/sysconfig/Android.bp b/product/blobs/etc/sysconfig/Android.bp index ecd9cfa..2029583 100644 --- a/product/blobs/etc/sysconfig/Android.bp +++ b/product/blobs/etc/sysconfig/Android.bp @@ -270,6 +270,14 @@ prebuilt_etc { filename_from_src: true, } +prebuilt_etc { + name: "pixel_experience_2025_midyear", + product_specific: true, + sub_dir: "sysconfig", + src: "pixel_experience_2025_midyear.xml", + filename_from_src: true, +} + prebuilt_etc { name: "preinstalled-packages-product-pixel-2017-and-newer", product_specific: true, @@ -310,6 +318,14 @@ prebuilt_etc { filename_from_src: true, } +prebuilt_etc { + name: "preinstalled-packages-product-pixel-2024-and-newer", + product_specific: true, + sub_dir: "sysconfig", + src: "preinstalled-packages-product-pixel-2024-and-newer.xml", + filename_from_src: true, +} + prebuilt_etc { name: "quick_tap", product_specific: true, diff --git a/product/blobs/etc/sysconfig/google.xml b/product/blobs/etc/sysconfig/google.xml index 62f6e18..a3ce82c 100644 --- a/product/blobs/etc/sysconfig/google.xml +++ b/product/blobs/etc/sysconfig/google.xml @@ -112,6 +112,7 @@ provided by the package. --> + diff --git a/product/blobs/etc/sysconfig/pixel_experience_2025_midyear.xml b/product/blobs/etc/sysconfig/pixel_experience_2025_midyear.xml new file mode 100644 index 0000000..f5eff85 --- /dev/null +++ b/product/blobs/etc/sysconfig/pixel_experience_2025_midyear.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/product/blobs/etc/sysconfig/preinstalled-packages-product-pixel-2024-and-newer.xml b/product/blobs/etc/sysconfig/preinstalled-packages-product-pixel-2024-and-newer.xml new file mode 100644 index 0000000..91061b5 --- /dev/null +++ b/product/blobs/etc/sysconfig/preinstalled-packages-product-pixel-2024-and-newer.xml @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/product/blobs/product_blobs.mk b/product/blobs/product_blobs.mk index 27be444..cc6997a 100644 --- a/product/blobs/product_blobs.mk +++ b/product/blobs/product_blobs.mk @@ -34,6 +34,7 @@ PRODUCT_PACKAGES += \ com.android.sdm.plugins.diagmon \ com.customermobile.preload.vzw \ com.google.android.apps.dreamliner \ + com.google.android.apps.pixel.familyspace \ com.google.android.apps.setupwizard.searchselector \ com.google.android.apps.stargate \ com.google.android.apps.stargate.support \ @@ -76,9 +77,10 @@ PRODUCT_PACKAGES += \ preinstalled-packages-product-pixel-2018-and-newer \ preinstalled-packages-product-pixel-2019-and-newer \ preinstalled-packages-product-pixel-2022-and-newer \ - preinstalled-packages-product-pixel-2023-and-newer + preinstalled-packages-product-pixel-2023-and-newer \ + preinstalled-packages-product-pixel-2024-and-newer -ifneq ($(filter blueline crosshatch sargo bonito flame coral sunfish bramble redfin barbet oriole raven bluejay panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet, $(LINEAGE_BUILD)),) +ifneq ($(filter blueline crosshatch sargo bonito flame coral sunfish bramble redfin barbet oriole raven bluejay panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet tegu, $(LINEAGE_BUILD)),) PRODUCT_PACKAGES += \ GoogleCamera_6gb_or_more_ram \ adaptivecharging \ @@ -114,6 +116,17 @@ PRODUCT_PACKAGES += \ pixel_experience_2024 \ pixel_experience_2024_midyear \ quick_tap +else ifeq ($(RELEASE_PIXEL_2025_ENABLED),true) +PRODUCT_PACKAGES += \ + pixel_experience_2021 \ + pixel_experience_2022 \ + pixel_experience_2022_midyear \ + pixel_experience_2023 \ + pixel_experience_2023_midyear \ + pixel_experience_2024 \ + pixel_experience_2024_midyear \ + pixel_experience_2025_midyear \ + quick_tap endif # GMS Verity Configuration diff --git a/product/packages/apps/Drive/Android.mk b/product/packages/apps/Drive/Android.mk deleted file mode 100644 index 698629d..0000000 --- a/product/packages/apps/Drive/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (C) 2018-2019 The Google Pixel3ROM Project -# Copyright (C) 2024 The hentaiOS Project and its Proprietors -# -# 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. -# -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := Drive -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := Drive.apk -LOCAL_CERTIFICATE := PRESIGNED -LOCAL_PRODUCT_MODULE := true -LOCAL_MODULE_CLASS := APPS -LOCAL_OPTIONAL_USES_LIBRARIES := org.apache.http.legacy androidx.window.extensions androidx.window.sidecar -LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -include $(BUILD_PREBUILT) diff --git a/product/packages/apps/Drive/Drive.apk b/product/packages/apps/Drive/Drive.apk deleted file mode 100644 index 4dcf921..0000000 Binary files a/product/packages/apps/Drive/Drive.apk and /dev/null differ diff --git a/system_ext/blobs/etc/permissions/privapp-permissions-google-se.xml b/system_ext/blobs/etc/permissions/privapp-permissions-google-se.xml index ad4df2d..cc66eee 100644 --- a/system_ext/blobs/etc/permissions/privapp-permissions-google-se.xml +++ b/system_ext/blobs/etc/permissions/privapp-permissions-google-se.xml @@ -149,6 +149,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -267,6 +268,7 @@ It allows additional grants on top of privapp-permissions-platform.xml +