Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- @@@<?xml version="1.0" encoding="UTF-8"?>
- @@@ <manifest>
- @@@ <project clone-depth="1" path="device/google/pantah" remote="evo-devices" name="device_google_pantah" revision="udc" />
- @@@ <project clone-depth="1" path="device/google/gs201" remote="evo-devices" name="device_google_gs201" revision="udc" />
- @@@ <project clone-depth="1" path="device/google/gs101" remote="evo-devices" name="device_google_gs101" revision="udc" />
- @@@ <project clone-depth="1" path="device/google/gs-common" remote="evo-devices" name="device_google_gs-common" revision="udc" />
- @@@ <project clone-depth="1" path="packages/apps/PixelParts" remote="evo-devices" name="packages_apps_PixelParts" revision="udc" />
- @@@ <project clone-depth="1" path="device/google/pantah-kernel" remote="aosp-pantah" name="device/google/pantah-kernel" />
- @@@ <project clone-depth="1" path="device/google/sunfish" remote="github" name="LineageOS/android_device_google_sunfish" revision="lineage-21" />
- @@@ <!--<project clone-depth="1" path="device/google/sunfish" remote="evo-devices" name="device_google_sunfish" revision="udc" />-->
- @@@ <project clone-depth="1" path="vendor/google/sunfish" remote="github" name="TheMuppets/proprietary_vendor_google_sunfish" revision="lineage-21" />
- @@@ <project clone-depth="1" path="vendor/google/panther" remote="github" name="TheMuppets/proprietary_vendor_google_panther" revision="lineage-21" />
- @@@ <project clone-depth="1" path="kernel/google/msm-4.14" remote="github" name="LineageOS/android_kernel_google_msm-4.14" revision="lineage-21" />
- @@@ <project clone-depth="1" path="device/google/panther" remote="evo-devices" name="device_google_panther" />
- @@@ <remove-project path="prebuilts/bazel/darwin-x86_64" name="platform/prebuilts/bazel/darwin-x86_64" groups="darwin,pdk" clone-depth="1" remote="aosp" />
- @@@ <remove-project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" groups="notdefault,platform-darwin,pdk,darwin,sysui-studio" clone-depth="1" remote="aosp" />
- @@@ <remove-project path="prebuilts/go/darwin-x86" name="platform/prebuilts/go/darwin-x86" groups="notdefault,platform-darwin,darwin,pdk,tradefed" clone-depth="1" remote="aosp" />
- @@@</manifest>
- --- build/soong/ui/build/path.go.orig 2024-08-26 18:03:11.728610963 +1000
- +++ build/soong/ui/build/path.go 2024-08-13 19:50:21.546671506 +1000
- @@ -192,10 +192,10 @@
- // Validate usage against disallowed or missing PATH tools.
- config := paths.GetConfig(log.Basename)
- if config.Error {
- - ctx.Printf("Disallowed PATH tool %q used: %#v", log.Basename, log.Args)
- - for _, line := range procPrints {
- - ctx.Println(line)
- - }
- + // ctx.Printf("Disallowed PATH tool %q used: %#v", log.Basename, log.Args)
- + // for _, line := range procPrints {
- + // ctx.Println(line)
- + // }
- } else {
- ctx.Verbosef("Unknown PATH tool %q used: %#v", log.Basename, log.Args)
- for _, line := range procPrints {
- --- build/soong/java/config/config.go.orig 2024-08-26 18:04:24.196785331 +1000
- +++ build/soong/java/config/config.go 2024-08-13 19:50:21.546671506 +1000
- @@ -79,7 +79,7 @@
- func init() {
- pctx.Import("github.com/google/blueprint/bootstrap")
- - exportedVars.ExportStringStaticVariable("JavacHeapSize", "4096M")
- + exportedVars.ExportStringStaticVariable("JavacHeapSize", "5120M")
- exportedVars.ExportStringStaticVariable("JavacHeapFlags", "-J-Xmx${JavacHeapSize}")
- // ErrorProne can use significantly more memory than javac alone, give it a higher heap
- --- vendor/google/panther/Android.bp.orig 2024-08-13 20:18:10.565821572 +1000
- +++ vendor/google/panther/Android.bp 2024-08-25 20:46:06.810729403 +1000
- @@ -93,7 +93,7 @@
- privileged: true,
- product_specific: true,
- }
- -
- +/*
- android_app_import {
- name: "DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore",
- owner: "google",
- @@ -119,7 +119,7 @@
- privileged: true,
- product_specific: true,
- }
- -
- +*/
- android_app_import {
- name: "DiagMon",
- owner: "google",
- @@ -257,7 +257,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- -
- +/*
- android_app_import {
- name: "ConnectivityThermalPowerManager",
- owner: "google",
- @@ -269,7 +269,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- -
- +*/
- android_app_import {
- name: "EuiccGoogleOverlay",
- owner: "google",
- @@ -308,6 +308,7 @@
- system_ext_specific: true,
- }
- +/*
- android_app_import {
- name: "HbmSVManager",
- owner: "google",
- @@ -319,6 +320,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- +*/
- android_app_import {
- name: "LLKAgent",
- --- device/google/pantah/lineage_panther.mk.orig 2024-08-30 22:35:55.286224007 +1000
- +++ device/google/pantah/lineage_panther.mk 2024-08-30 22:36:51.897346305 +1000
- @@ -21,6 +21,8 @@
- PRODUCT_MODEL := Pixel 7
- PRODUCT_NAME := lineage_panther
- +TARGET_USES_PICO_GAPPS := true
- +
- # Boot animation
- TARGET_SCREEN_HEIGHT := 2400
- TARGET_SCREEN_WIDTH := 1080
- --- device/google/sunfish/device-lineage.mk.orig 2024-08-30 09:47:06.519527622 +1000
- +++ device/google/sunfish/device-lineage.mk 2024-08-30 09:47:26.218362763 +1000
- @@ -35,8 +35,8 @@
- PRODUCT_PRODUCT_PROPERTIES += ro.opa.eligible_device=true
- # HBM
- -PRODUCT_PACKAGES += \
- - HbmSVManagerOverlay
- +#PRODUCT_PACKAGES += \
- +# HbmSVManagerOverlay
- # Lineage Health
- include hardware/google/pixel/lineage_health/device.mk
- --- device/google/sunfish/lineage_sunfish.mk.orig 2024-08-30 09:47:38.281682528 +1000
- +++ device/google/sunfish/lineage_sunfish.mk 2024-08-30 09:49:33.836224127 +1000
- @@ -21,6 +21,9 @@
- TARGET_SCREEN_HEIGHT := 2340
- TARGET_SCREEN_WIDTH := 1080
- +# Gapps
- +TARGET_USES_PICO_GAPPS := true
- +
- PRODUCT_BUILD_PROP_OVERRIDES += \
- TARGET_PRODUCT=sunfish \
- PRIVATE_BUILD_DESC="sunfish-user 13 TQ3A.230805.001.S1 10786265 release-keys"
- --- device/google/gs101/device.mk.orig 2024-08-13 20:18:08.069732135 +1000
- +++ device/google/gs101/device.mk 2024-08-13 20:23:14.636658206 +1000
- @@ -1036,8 +1036,8 @@
- PRODUCT_PACKAGES += edgetpu-abrolhos.fw
- # Connectivity Thermal Power Manager
- -PRODUCT_PACKAGES += \
- - ConnectivityThermalPowerManager
- +#PRODUCT_PACKAGES += \
- +# ConnectivityThermalPowerManager
- # A/B support
- PRODUCT_PACKAGES += \
- --- device/google/gs201/device.mk.orig 2024-08-13 20:18:08.089732851 +1000
- +++ device/google/gs201/device.mk 2024-08-13 20:23:14.636658206 +1000
- @@ -1085,8 +1085,8 @@
- PRODUCT_PACKAGES += edgetpu-janeiro.fw
- # Connectivity Thermal Power Manager
- -PRODUCT_PACKAGES += \
- - ConnectivityThermalPowerManager
- +#PRODUCT_PACKAGES += \
- +# ConnectivityThermalPowerManager
- # A/B support
- PRODUCT_PACKAGES += \
- --- vendor/lineage/config/aosp_audio.mk.orig 2024-08-16 19:27:31.994752292 +1000
- +++ vendor/lineage/config/aosp_audio.mk 2024-08-16 19:28:22.273792073 +1000
- @@ -30,7 +30,9 @@
- vendor/lineage/prebuilt/common/media/audio/alarms/Neon-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Neon-old.ogg \
- vendor/lineage/prebuilt/common/media/audio/alarms/Osmium-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Osmium-old.ogg \
- vendor/lineage/prebuilt/common/media/audio/alarms/Oxygen-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Oxygen-old.ogg \
- - vendor/lineage/prebuilt/common/media/audio/alarms/Platinum-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Platinum-old.ogg
- + vendor/lineage/prebuilt/common/media/audio/alarms/Platinum-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Platinum-old.ogg \
- + vendor/lineage/prebuilt/common/media/audio/notifications/CyanMessage.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/CyanMessage.ogg \
- + vendor/lineage/prebuilt/common/media/audio/ringtones/Defined.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Defined.ogg
- PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/F1_New_SMS.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_New_SMS.ogg \
- --- vendor/lineage/config/telephony.mk.orig 2024-08-16 19:30:09.371771540 +1000
- +++ vendor/lineage/config/telephony.mk 2024-08-16 19:30:57.742868610 +1000
- @@ -19,10 +19,10 @@
- # Default ringtone
- ifeq ($(WITH_GMS),true)
- PRODUCT_PRODUCT_PROPERTIES += \
- - ro.config.ringtone=Your_new_adventure.ogg
- + ro.config.ringtone=Defined.ogg
- else
- PRODUCT_PRODUCT_PROPERTIES += \
- - ro.config.ringtone=Orion.ogg
- + ro.config.ringtone=Defined.ogg
- endif
- # Tethering - allow without requiring a provisioning app
- --- vendor/lineage/config/common_mobile.mk.orig 2024-08-16 19:29:09.476897631 +1000
- +++ vendor/lineage/config/common_mobile.mk 2024-08-22 19:30:45.900796725 +1000
- @@ -11,12 +11,12 @@
- # Default notification/alarm sounds
- ifeq ($(WITH_GMS),true)
- PRODUCT_PRODUCT_PROPERTIES += \
- - ro.config.notification_sound=Eureka.ogg \
- - ro.config.alarm_alert=Fresh_start.ogg
- + ro.config.notification_sound=CyanMessage.ogg \
- + ro.config.alarm_alert=CyanAlarm.ogg
- else
- PRODUCT_PRODUCT_PROPERTIES += \
- - ro.config.notification_sound=Argon.ogg \
- - ro.config.alarm_alert=Hassium.ogg
- + ro.config.notification_sound=CyanMessage.ogg \
- + ro.config.alarm_alert=CyanAlarm.ogg
- endif
- # Apps
- --- vendor/gms/gms_pico.mk.orig 2024-08-30 19:28:16.110285748 +1000
- +++ vendor/gms/gms_pico.mk 2024-08-30 23:31:41.129463930 +1000
- @@ -21,20 +21,13 @@
- # product/app
- PRODUCT_PACKAGES += \
- - CalculatorGooglePrebuilt_85005407 \
- - Chrome \
- Chrome-Stub \
- - GeminiPrebuilt \
- - GoogleContacts \
- GoogleTTS \
- - LatinIMEGooglePrebuilt \
- LocationHistoryPrebuilt \
- MarkupGoogle_v2 \
- PixelThemesStub \
- PixelThemesStub2022_and_newer \
- PlayAutoInstallConfig \
- - PrebuiltDeskClockGoogle_76003530 \
- - PrebuiltBugle \
- SoundPickerPrebuilt \
- TrichromeLibrary \
- TrichromeLibrary-Stub \
- @@ -51,19 +44,13 @@
- CreativeAssistant \
- DeviceIntelligenceNetworkPrebuilt-U.21_playstore_astrea_20240222.00_RC01 \
- DevicePersonalizationPrebuiltPixel2024-U.21_P24_aiai_20240327.00_RC01 \
- - GoogleDialer \
- GoogleOneTimeInitializer \
- GoogleRestorePrebuilt-v509024 \
- - KidsSupervisionStub \
- - MaestroPrebuilt \
- - OdadPrebuilt \
- PartnerSetupPrebuilt \
- Phonesky \
- - SafetyHubPrebuilt \
- SettingsIntelligenceGooglePrebuilt \
- SetupWizardPrebuilt \
- TurboPrebuilt \
- - UvExposureReporter \
- WellbeingPrebuilt
- # system/app
- @@ -78,7 +65,6 @@
- # system_ext/app
- PRODUCT_PACKAGES += \
- - EmergencyInfoGoogleNoUi \
- Flipendo
- # system_ext/priv-app
- --- build/make/core/envsetup.mk.orig 2024-08-26 17:58:07.403871062 +1000
- +++ build/make/core/envsetup.mk 2024-08-13 19:50:21.546671506 +1000
- @@ -168,7 +168,7 @@
- # We can only create static host binaries for Linux, so if static host
- # binaries are requested, turn off Windows cross-builds.
- ifeq ($(BUILD_HOST_static),)
- - HOST_CROSS_OS := windows
- + HOST_CROSS_OS :=
- HOST_CROSS_ARCH := x86
- HOST_CROSS_2ND_ARCH := x86_64
- 2ND_HOST_CROSS_IS_64_BIT := true
- --- build/make/core/clear_vars.mk.orig 2024-08-26 18:00:03.508158116 +1000
- +++ build/make/core/clear_vars.mk 2024-08-13 19:50:21.546671506 +1000
- @@ -31,7 +31,7 @@
- LOCAL_CHECK_SAME_VNDK_VARIANTS:=
- LOCAL_CHECKED_MODULE:=
- LOCAL_C_INCLUDES:=
- -LOCAL_CLANG:=
- +LOCAL_CLANG:=true
- LOCAL_CLANG_ASFLAGS:=
- LOCAL_CLANG_CFLAGS:=
- LOCAL_CLANG_CONLYFLAGS:=
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement