Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- vendor/google/sunfish/Android.bp.bak 2024-02-17 13:37:56.489829033 +1100
- +++ vendor/google/sunfish/Android.bp 2024-02-17 13:38:18.149554840 +1100
- @@ -383,6 +383,7 @@
- system_ext_specific: true,
- }
- +/*
- android_app_import {
- name: "HbmSVManager",
- owner: "google",
- @@ -394,6 +395,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- +*/
- android_app_import {
- name: "MyVerizonServices",
- --- vendor/google/panther/panther-vendor.mk.bak 2024-02-17 13:47:40.290327551 +1100
- +++ vendor/google/panther/panther-vendor.mk 2024-02-17 13:48:31.525661807 +1100
- @@ -70,7 +70,7 @@
- vendor/google/panther/proprietary/system_ext/lib64/com.google.edgetpu_app_service-V2-ndk.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.google.edgetpu_app_service-V2-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/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/vendor.samsung_slsi.telephony.hardware.oemservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.samsung_slsi.telephony.hardware.oemservice@1.0.so \
- vendor/google/panther/proprietary/system_ext/lib64/vendor.samsung_slsi.telephony.hardware.radioExternal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.samsung_slsi.telephony.hardware.radioExternal@1.0.so \
- @@ -110,7 +110,7 @@
- EuiccGoogleOverlay \
- EuiccSupportPixel \
- EuiccSupportPixelPermissions \
- - HbmSVManager \
- + #HbmSVManager \
- LLKAgent \
- MyVerizonServices \
- OemRilService \
- --- vendor/google/panther/Android.bp.bak 2024-02-17 13:47:35.222393361 +1100
- +++ vendor/google/panther/Android.bp 2024-02-17 13:47:59.214081737 +1100
- @@ -293,6 +293,7 @@
- system_ext_specific: true,
- }
- +/*
- android_app_import {
- name: "HbmSVManager",
- owner: "google",
- @@ -304,6 +305,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- +*/
- android_app_import {
- name: "LLKAgent",
- --- device/google/pantah/lineage_panther.mk.bak 2024-02-12 12:41:25.544793715 +1100
- +++ device/google/pantah/lineage_panther.mk 2024-02-12 12:41:56.385139677 +1100
- @@ -30,3 +30,6 @@
- BUILD_FINGERPRINT := google/panther/panther:14/UQ1A.240205.002/11224170:user/release-keys
- $(call inherit-product, vendor/google/panther/panther-vendor.mk)
- +# GAPPS
- +$(call inherit-product, vendor/gapps/arm64/arm64-vendor.mk)
- +TARGET_GAPPS_ARCH=arm64
- --- device/google/sunfish/BoardConfigLineage.mk.bak 2024-02-12 12:33:16.949520486 +1100
- +++ device/google/sunfish/BoardConfigLineage.mk 2024-02-12 12:34:13.421280344 +1100
- @@ -30,7 +30,7 @@
- BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
- # Reserve space for gapps install
- --include vendor/lineage/config/BoardConfigReservedSize.mk
- +#-include vendor/lineage/config/BoardConfigReservedSize.mk
- # SELinux
- BOARD_SEPOLICY_DIRS += device/google/sunfish/sepolicy-lineage/dynamic
- --- device/google/sunfish/device-lineage.mk.bak 2024-02-12 12:33:26.541480828 +1100
- +++ device/google/sunfish/device-lineage.mk 2024-02-12 12:35:14.709003901 +1100
- @@ -29,8 +29,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
- --- build/soong/ui/build/path.go.bak 2024-02-12 12:22:38.465162505 +1100
- +++ build/soong/ui/build/path.go 2024-02-12 12:23:40.589641459 +1100
- @@ -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.bak 2024-02-12 12:27:01.082391772 +1100
- +++ build/soong/java/config/config.go 2024-02-12 12:27:56.610389903 +1100
- @@ -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
- --- build/make/core/envsetup.mk.bak 2024-02-12 12:30:42.790073363 +1100
- +++ build/make/core/envsetup.mk 2024-02-12 12:31:26.069936855 +1100
- @@ -157,7 +157,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.bak 2024-02-12 12:30:54.030039609 +1100
- +++ build/make/core/clear_vars.mk 2024-02-12 12:31:47.925861726 +1100
- @@ -34,7 +34,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:=
- --- vendor/lineage/build/envsetup.sh.bak 2024-02-12 16:21:38.896751546 +1100
- +++ vendor/lineage/build/envsetup.sh 2024-02-12 16:22:00.448359155 +1100
- @@ -960,9 +960,9 @@
- fi
- }
- -echo "Building with ThinLTO."
- -export GLOBAL_THINLTO=true
- -export USE_THINLTO_CACHE=true
- +#echo "Building with ThinLTO."
- +#export GLOBAL_THINLTO=true
- +#export USE_THINLTO_CACHE=true
- export SKIP_ABI_CHECKS=true
- export BUILD_BROKEN_DISABLE_BAZEL=true
- --- vendor/lineage/config/aosp_audio.mk.bak 2024-02-12 12:47:38.743526966 +1100
- +++ vendor/lineage/config/aosp_audio.mk 2024-02-12 12:57:11.956129156 +1100
- @@ -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.bak 2024-02-12 12:47:57.983599836 +1100
- +++ vendor/lineage/config/telephony.mk 2024-02-12 12:51:51.260133881 +1100
- @@ -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-03-09 20:49:30.640976640 +1100
- +++ vendor/lineage/config/common_mobile.mk 2024-03-09 20:49:53.496800646 +1100
- @@ -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.bak 2024-02-17 13:38:02.009759200 +1100
- +++ vendor/google/sunfish/sunfish-vendor.mk 2024-02-17 13:38:37.253312644 +1100
- @@ -96,7 +96,7 @@
- EuiccGoogleOverlay \
- EuiccSupportPixel \
- EuiccSupportPixelPermissions \
- - HbmSVManager \
- + #HbmSVManager \
- MyVerizonServices \
- OBDM_Permissions \
- RilConfigService \
- --- device/google/sunfish/lineage_sunfish.mk.orig 2024-03-09 20:16:47.815142937 +1100
- +++ device/google/sunfish/lineage_sunfish.mk 2024-03-10 11:55:49.831210807 +1100
- @@ -28,3 +28,6 @@
- BUILD_FINGERPRINT := google/sunfish/sunfish:13/TQ3A.230805.001.S1/10786265:user/release-keys
- $(call inherit-product, vendor/google/sunfish/sunfish-vendor.mk)
- +# GAPPS
- +$(call inherit-product, vendor/gapps/arm64/arm64-vendor.mk)
- +TARGET_GAPPS_ARCH=arm64
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement