Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- @@@<?xml version="1.0" encoding="UTF-8"?>
- @@@<manifest>
- @@@ <remote name="bitbucket"
- @@@ fetch="https://bitbucket.org/projectmatrixx"
- @@@ sync-c="true"
- @@@ sync-j="4"
- @@@ revision="refs/heads/14.0" />
- @@@ <remote fetch="https://gitlab.com/" name="gitlab" />
- @@@
- @@@ <!-- Pix7 -->
- @@@ <project clone-depth="1" path="device/google/panther" remote="github" name="LineageOS/android_device_google_panther" revision="lineage-21" />
- @@@ <project clone-depth="1" path="device/google/pantah" remote="github" name="LineageOS/android_device_google_pantah" revision="lineage-21" />
- @@@ <project clone-depth="1" path="device/google/gs201" remote="github" name="LineageOS/android_device_google_gs201" revision="lineage-21" />
- @@@ <project clone-depth="1" path="device/google/pantah-kernel" remote="aosp-pantah" name="device/google/pantah-kernel" />
- @@@ <project clone-depth="1" path="device/google/gs101" remote="github" name="LineageOS/android_device_google_gs101" revision="lineage-21" />
- @@@ <project clone-depth="1" path="device/google/gs-common" remote="github" name="LineageOS/android_device_google_gs-common" 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" name="Matrixx-Devices/vendor_google_panther" path="vendor/google/panther" remote="github" revision="14.0" />-->
- @@@
- @@@ <!-- Gapps -->
- @@@ <!--<project clone-depth="1" name="DhineshCool/evx-gms" path="vendor/gms" remote="gitlab" revision="udc" />-->
- @@@ <project clone-depth="1" name="MindTheGapps/vendor_gapps" path="vendor/gapps" remote="gitlab" revision="upsilon" />
- @@@ <!--<project clone-depth="1" path="vendor/gapps" name="android_vendor_gapps" remote="bitbucket" />-->
- @@@ <!--<project clone-depth="1" name="BlissLabs/BlissRoms/platform_vendor_gapps" path="vendor/gapps" remote="gitlab" revision="universe" />-->
- @@@
- @@@ <!-- Pix4a -->
- @@@ <project clone-depth="1" name="LineageOS/android_device_google_sunfish" path="device/google/sunfish" remote="github" revision="lineage-21" />
- @@@ <project clone-depth="1" name="LineageOS/android_kernel_google_msm-4.14" path="kernel/google/msm-4.14" remote="github" revision="lineage-21" />
- @@@ <project clone-depth="1" name="TheMuppets/proprietary_vendor_google_sunfish" path="vendor/google/sunfish" remote="github" revision="lineage-21" />
- @@@
- @@@ <!-- Remove Darwin stuff -->
- @@@ <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-06-23 19:32:55.676477635 +1000
- +++ build/soong/ui/build/path.go 2024-06-23 20:24:01.990227130 +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-06-23 19:32:55.664477725 +1000
- +++ build/soong/java/config/config.go 2024-06-23 20:24:01.994227077 +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/sunfish/Android.bp.orig 2024-09-02 15:24:39.820715556 +1000
- +++ vendor/google/sunfish/Android.bp 2024-09-02 15:25:05.238504559 +1000
- @@ -399,7 +399,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- -
- +/*
- android_app_import {
- name: "HbmSVManager",
- owner: "google",
- @@ -411,7 +411,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- -
- +*/
- android_app_import {
- name: "MyVerizonServices",
- owner: "google",
- --- vendor/google/panther/Android.bp.orig 2024-09-02 12:03:12.767245312 +1000
- +++ vendor/google/panther/Android.bp 2024-09-02 12:12:05.254343673 +1000
- @@ -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",
- @@ -307,7 +307,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- -
- +/*
- android_app_import {
- name: "HbmSVManager",
- owner: "google",
- @@ -319,7 +319,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- -
- +*/
- android_app_import {
- name: "LLKAgent",
- owner: "google",
- --- device/google/pantah/lineage_panther.mk.orig 2024-09-02 12:12:33.490558731 +1000
- +++ device/google/pantah/lineage_panther.mk 2024-09-02 12:18:35.525559828 +1000
- @@ -14,6 +14,9 @@
- include device/google/pantah/panther/device-lineage.mk
- +# GAPPS
- +$(call inherit-product, vendor/gapps/arm64/arm64-vendor.mk)
- +
- # Device identifier. This must come after all inclusions
- PRODUCT_BRAND := google
- PRODUCT_MODEL := Pixel 7
- --- device/google/sunfish/lineage_sunfish.mk.orig 2024-06-23 19:33:06.592394501 +1000
- +++ device/google/sunfish/lineage_sunfish.mk 2024-09-02 15:23:50.262373907 +1000
- @@ -12,6 +12,9 @@
- include device/google/sunfish/device-lineage.mk
- +# GAPPS
- +$(call inherit-product, vendor/gapps/arm64/arm64-vendor.mk)
- +
- # Device identifier. This must come after all inclusions
- PRODUCT_BRAND := google
- PRODUCT_MODEL := Pixel 4a
- --- vendor/lineage/config/aosp_audio.mk.orig 2024-08-16 17:11:05.865527059 +1000
- +++ vendor/lineage/config/aosp_audio.mk 2024-08-16 17:12:23.774969404 +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 17:11:05.865527059 +1000
- +++ vendor/lineage/config/telephony.mk 2024-08-16 17:12:23.774969404 +1000
- @@ -18,7 +18,7 @@
- # Default ringtone
- PRODUCT_PRODUCT_PROPERTIES += \
- - ro.config.ringtone=Orion.ogg
- + ro.config.ringtone=Defined.ogg
- # Tethering - allow without requiring a provisioning app
- # (for devices that check this)
- --- vendor/lineage/config/common_mobile.mk.orig 2024-08-16 17:11:05.865527059 +1000
- +++ vendor/lineage/config/common_mobile.mk 2024-08-16 17:12:23.774969404 +1000
- @@ -10,7 +10,7 @@
- # Default notification/alarm sounds
- PRODUCT_PRODUCT_PROPERTIES += \
- - ro.config.notification_sound=Argon.ogg \
- + ro.config.notification_sound=CyanMessage.ogg \
- ro.config.alarm_alert=Hassium.ogg
- # Apps
- --- vendor/google/sunfish/sunfish-vendor.mk.orig 2024-09-02 15:25:13.165465419 +1000
- +++ vendor/google/sunfish/sunfish-vendor.mk 2024-09-02 15:25:26.804275451 +1000
- @@ -101,7 +101,6 @@
- EuiccGoogleOverlay \
- EuiccSupportPixel \
- EuiccSupportPixelPermissions \
- - HbmSVManager \
- MyVerizonServices \
- OBDM_Permissions \
- RilConfigService \
- --- vendor/google/panther/panther-vendor.mk.orig 2024-09-02 12:04:34.079558977 +1000
- +++ vendor/google/panther/panther-vendor.mk 2024-09-02 12:06:40.892186851 +1000
- @@ -71,7 +71,6 @@
- vendor/google/panther/proprietary/system_ext/lib64/com.google.edgetpu_app_service-V3-ndk.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.google.edgetpu_app_service-V3-ndk.so \
- vendor/google/panther/proprietary/system_ext/lib64/com.google.edgetpu_vendor_service-V2-ndk.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.google.edgetpu_vendor_service-V2-ndk.so \
- vendor/google/panther/proprietary/system_ext/lib64/libedgetpu_dba.google.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libedgetpu_dba.google.so \
- - vendor/google/panther/proprietary/system_ext/lib64/libhbmsvmanager_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libhbmsvmanager_jni.so \
- vendor/google/panther/proprietary/system_ext/lib64/libmediaadaptor.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmediaadaptor.so \
- vendor/google/panther/proprietary/system_ext/lib64/[email protected]:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/[email protected] \
- vendor/google/panther/proprietary/system_ext/lib64/[email protected]:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/[email protected] \
- @@ -107,11 +106,9 @@
- WfcActivation \
- OemRilHookService \
- CarrierSetup \
- - ConnectivityThermalPowerManager \
- EuiccGoogleOverlay \
- EuiccSupportPixel \
- EuiccSupportPixelPermissions \
- - HbmSVManager \
- LLKAgent \
- MyVerizonServices \
- OemRilService \
- @@ -134,8 +131,7 @@
- libdmengine_libdmengine_symlink32 \
- libdmjavaplugin_libdmjavaplugin_symlink32 \
- libdmengine_libdmengine_symlink64 \
- - libdmjavaplugin_libdmjavaplugin_symlink64 \
- - libhbmsvmanager_jni_libhbmsvmanager_jni_symlink64
- + libdmjavaplugin_libdmjavaplugin_symlink64
- PRODUCT_COPY_FILES += \
- vendor/google/panther/proprietary/product/etc/CarrierSettings/1and1_de.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/1and1_de.pb \
- vendor/google/panther/proprietary/product/etc/CarrierSettings/2degrees_nz.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/2degrees_nz.pb \
- --- build/make/core/envsetup.mk.orig 2024-06-24 18:28:35.909772787 +1000
- +++ build/make/core/envsetup.mk 2024-06-24 18:29:01.552593603 +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-06-23 19:32:55.524478784 +1000
- +++ build/make/core/clear_vars.mk 2024-06-23 20:24:01.994227077 +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