Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- @@@<?xml version="1.0" encoding="UTF-8"?>
- @@@<manifest>
- @@@ <remote fetch="https://gitlab.com/" name="gitlab" />
- @@@ <project clone-depth="1" path="device/google/shusky" name="crdroidandroid/android_device_google_shusky" remote="github" revision="15.0" />
- @@@ <project clone-depth="1" path="device/google/shusky-kernels/5.15" name="device/google/shusky-kernels/5.15" remote="aosp-shusky" revision="refs/tags/android-15.0.0_r4" />
- @@@ <project clone-depth="1" path="device/google/zuma" name="crdroidandroid/android_device_google_zuma" remote="github" revision="15.0" />
- @@@ <project clone-depth="1" path="device/google/pantah" name="crdroidandroid/android_device_google_pantah" remote="github" revision="15.0" />
- @@@ <project clone-depth="1" path="device/google/pantah-kernels/5.10" name="device/google/pantah-kernels/5.10" remote="aosp-pantah" revision="refs/tags/android-15.0.0_r2" />
- @@@ <project clone-depth="1" path="device/google/lynx-kernels/5.10" name="device/google/lynx-kernels/5.10" remote="aosp-lynx" revision="refs/tags/android-15.0.0_r2" />
- @@@ <project clone-depth="1" path="device/google/gs201" name="crdroidandroid/android_device_google_gs201" remote="github" revision="15.0" />
- @@@ <project clone-depth="1" path="device/google/gs101" name="crdroidandroid/android_device_google_gs101" remote="github" revision="15.0" />
- @@@ <project clone-depth="1" path="device/google/gs-common" name="crdroidandroid/android_device_google_gs-common" remote="github" revision="15.0" />
- @@@ <project clone-depth="1" path="vendor/google/panther" name="crdroidandroid/proprietary_vendor_google_panther" remote="github" revision="15.0" />
- @@@ <project clone-depth="1" path="vendor/google/cheetah" name="crdroidandroid/proprietary_vendor_google_cheetah" remote="github" revision="15.0" />
- @@@ <project clone-depth="1" path="vendor/google/shiba" name="crdroidandroid/proprietary_vendor_google_shiba" remote="github" revision="15.0" />
- @@@ <project clone-depth="1" path="device/google/sunfish" name="RisingOSS-devices/android_device_google_sunfish" remote="github" revision="fifteen" />
- @@@ <project clone-depth="1" path="kernel/google/msm-4.14" name="LineageOS/android_kernel_google_msm-4.14" remote="github" revision="lineage-22.0" />
- @@@ <project clone-depth="1" path="vendor/google/sunfish" name="RisingOSS-devices/android_vendor_google_sunfish" remote="github" revision="fifteen" />
- @@@ <project clone-depth="1" path="vendor/gapps" name="MindTheGapps/vendor_gapps" remote="gitlab" revision="vic" />
- @@@</manifest>
- --- ./build/soong/ui/build/path.go.orig 2024-11-15 20:23:38.990646096 +1100
- +++ ./build/soong/ui/build/path.go 2024-11-15 20:27:07.249519828 +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.orig 2024-11-15 20:27:52.201701805 +1100
- +++ ./build/soong/java/config/config.go 2024-11-15 20:29:04.804523596 +1100
- @@ -79,7 +79,7 @@
- func init() {
- pctx.Import("github.com/google/blueprint/bootstrap")
- - pctx.StaticVariable("JavacHeapSize", "4096M")
- + pctx.StaticVariable("JavacHeapSize", "5120M")
- pctx.StaticVariable("JavacHeapFlags", "-J-Xmx${JavacHeapSize}")
- // ErrorProne can use significantly more memory than javac alone, give it a higher heap
- --- ./vendor/gapps/arm64/Android.bp.orig 2024-12-08 07:07:22.528952363 +1100
- +++ ./vendor/gapps/arm64/Android.bp 2024-12-08 07:07:43.504471316 +1100
- @@ -7,7 +7,7 @@
- "vendor/gapps/common",
- ],
- }
- -
- +/*
- cc_prebuilt_library_shared {
- name: "libjni_latinimegoogle",
- owner: "gapps",
- @@ -28,7 +28,7 @@
- prefer: true,
- product_specific: true,
- }
- -
- +*/
- android_app_import {
- name: "GmsCore",
- owner: "gapps",
- --- ./vendor/google/shiba/Android.bp.orig 2024-11-16 23:18:21.088493116 +1100
- +++ ./vendor/google/shiba/Android.bp 2024-11-16 23:19:00.843844706 +1100
- @@ -476,7 +476,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- -
- +/*
- android_app_import {
- name: "ConnectivityThermalPowerManager",
- owner: "google",
- @@ -488,7 +488,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- -
- +*/
- android_app_import {
- name: "EuiccGoogleOverlay",
- owner: "google",
- --- ./vendor/google/panther/Android.bp.orig 2024-11-15 20:54:10.317744277 +1100
- +++ ./vendor/google/panther/Android.bp 2024-11-15 20:56:44.835043867 +1100
- @@ -230,7 +230,7 @@
- prefer: true,
- system_ext_specific: true,
- }
- -
- +/*
- cc_prebuilt_library_shared {
- name: "libhbmsvmanager_jni",
- owner: "google",
- @@ -258,7 +258,7 @@
- prefer: true,
- system_ext_specific: true,
- }
- -
- +*/
- android_app_import {
- name: "VZWAPNLib",
- owner: "google",
- @@ -509,7 +509,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- -
- +/*
- android_app_import {
- name: "ConnectivityThermalPowerManager",
- owner: "google",
- @@ -521,7 +521,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- -
- +*/
- android_app_import {
- name: "EuiccGoogleOverlay",
- owner: "google",
- @@ -559,7 +559,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- -
- +/*
- android_app_import {
- name: "HbmSVManager",
- owner: "google",
- @@ -571,7 +571,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- -
- +*/
- android_app_import {
- name: "MyVerizonServices",
- owner: "google",
- @@ -802,14 +802,14 @@
- installed_location: "priv-app/DMService/lib/arm64/libdmjavaplugin.so",
- symlink_target: "/product/lib64/libdmjavaplugin.so",
- }
- -
- +/*
- install_symlink {
- name: "system_ext_priv-app_HbmSVManager_lib_arm64_libhbmsvmanager_jni_so",
- system_ext_specific: true,
- installed_location: "priv-app/HbmSVManager/lib/arm64/libhbmsvmanager_jni.so",
- symlink_target: "/system_ext/lib64/libhbmsvmanager_jni.so",
- }
- -
- +*/
- cc_prebuilt_library_shared {
- name: "aoc_aud_ext",
- owner: "google",
- --- ./device/google/sunfish/lineage_sunfish.mk.orig 2024-12-06 14:57:31.288886172 +1100
- +++ ./device/google/sunfish/lineage_sunfish.mk 2024-12-07 23:46:44.891221028 +1100
- @@ -18,9 +18,10 @@
- TARGET_BOOT_ANIMATION_RES := 1080
- # Gapps
- -WITH_GMS := true
- -TARGET_CORE_GMS := true
- -TARGET_DEFAULT_PIXEL_LAUNCHER := true
- +#WITH_GMS := true
- +#TARGET_CORE_GMS := true
- +#TARGET_DEFAULT_PIXEL_LAUNCHER := true
- +$(call inherit-product, vendor/gapps/arm64/arm64-vendor.mk)
- # Extra Flags.
- RISING_BATTERY := 3140mah
- @@ -33,8 +34,6 @@
- PRODUCT_NAME := lineage_sunfish
- PRODUCT_BUILD_PROP_OVERRIDES += \
- - RisingChipset="Snapdragon730G" \
- - RisingMaintainer="xioyo" \
- BuildDesc="sunfish-user 13 TQ3A.230805.001.S1 10786265 release-keys" \
- BuildFingerprint=google/sunfish/sunfish:13/TQ3A.230805.001.S1/10786265:user/release-keys \
- DeviceProduct=sunfish
- --- ./vendor/lineage/config/common_mobile.mk.orig 2024-11-15 20:50:44.176838789 +1100
- +++ ./vendor/lineage/config/common_mobile.mk 2024-11-15 20:51:02.309233267 +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/shiba/shiba-vendor.mk.orig 2024-11-16 23:18:28.332375526 +1100
- +++ ./vendor/google/shiba/shiba-vendor.mk 2024-11-16 23:19:20.311524517 +1100
- @@ -98,7 +98,6 @@
- WfcActivation \
- OemRilHookService \
- CarrierSetup \
- - ConnectivityThermalPowerManager \
- EuiccGoogleOverlay \
- EuiccSupportPixel-P23 \
- EuiccSupportPixelPermissions \
- --- ./vendor/google/panther/panther-vendor.mk.orig 2024-11-15 20:57:35.037811750 +1100
- +++ ./vendor/google/panther/panther-vendor.mk 2024-11-15 20:58:57.211538939 +1100
- @@ -448,7 +448,6 @@
- libmediaadaptor \
- com.google.edgetpu_app_service-V3-ndk \
- com.google.edgetpu_vendor_service-V2-ndk \
- - libhbmsvmanager_jni \
- VZWAPNLib \
- AppDirectedSMSService \
- CarrierSettings_signed_47.0.602606545 \
- @@ -469,11 +468,9 @@
- WfcActivation \
- OemRilHookService \
- CarrierSetup \
- - ConnectivityThermalPowerManager \
- EuiccGoogleOverlay \
- EuiccSupportPixel \
- EuiccSupportPixelPermissions \
- - HbmSVManager \
- MyVerizonServices \
- OemRilService \
- PixelQualifiedNetworksService \
- @@ -496,8 +493,7 @@
- product_priv-app_DMService_lib_arm_libdmengine_so \
- product_priv-app_DMService_lib_arm_libdmjavaplugin_so \
- product_priv-app_DMService_lib_arm64_libdmengine_so \
- - product_priv-app_DMService_lib_arm64_libdmjavaplugin_so \
- - system_ext_priv-app_HbmSVManager_lib_arm64_libhbmsvmanager_jni_so
- + product_priv-app_DMService_lib_arm64_libdmjavaplugin_so
- PRODUCT_COPY_FILES += \
- vendor/google/panther/proprietary/vendor/etc/atc_profile.json:$(TARGET_COPY_OUT_VENDOR)/etc/atc_profile.json \
- --- ./build/make/core/envsetup.mk.orig 2024-11-15 20:51:34.457752489 +1100
- +++ ./build/make/core/envsetup.mk 2024-11-15 20:52:24.270157121 +1100
- @@ -149,7 +149,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-11-15 20:52:50.034200740 +1100
- +++ ./build/make/core/clear_vars.mk 2024-11-15 20:53:02.834185010 +1100
- @@ -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