Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- build/soong/ui/build/path.go.orig 2024-09-15 20:57:55.985734167 +1000
- +++ build/soong/ui/build/path.go 2024-09-16 18:29:05.553706014 +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-09-15 20:57:55.973734624 +1000
- +++ build/soong/java/config/config.go 2024-09-16 18:29:05.553706014 +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-09-16 18:07:12.899839344 +1000
- +++ vendor/google/panther/Android.bp 2024-09-16 18:07:29.695864139 +1000
- @@ -381,7 +381,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- -
- +/*
- android_app_import {
- name: "ConnectivityThermalPowerManager",
- owner: "google",
- @@ -393,7 +393,7 @@
- privileged: true,
- system_ext_specific: true,
- }
- -
- +*/
- android_app_import {
- name: "EuiccGoogleOverlay",
- owner: "google",
- --- device/google/pantah/infinity_panther.mk.orig 2024-09-16 18:20:56.197019917 +1000
- +++ device/google/pantah/infinity_panther.mk 2024-09-16 18:21:21.345055319 +1000
- @@ -9,7 +9,7 @@
- $(call inherit-product, vendor/infinity/config/common_full_phone.mk)
- # Infinity-X Flags
- -WITH_GMS := true
- +WITH_GAPPS := true
- INFINITY_BUILD_TYPE := OFFICIAL
- INFINITY_MAINTAINER := Pyrtle93
- TARGET_HAS_UDFPS := true
- --- vendor/google/panther/panther-vendor.mk.orig 2024-09-16 18:07:35.831873183 +1000
- +++ vendor/google/panther/panther-vendor.mk 2024-09-16 18:08:27.951949782 +1000
- @@ -96,7 +96,6 @@
- WfcActivation \
- OemRilHookService \
- CarrierSetup \
- - ConnectivityThermalPowerManager \
- EuiccGoogleOverlay \
- EuiccSupportPixel \
- EuiccSupportPixelPermissions \
- --- vendor/infinity/audio/audio.mk.orig 2024-09-16 18:01:43.183348612 +1000
- +++ vendor/infinity/audio/audio.mk 2024-09-16 18:02:51.211445764 +1000
- @@ -21,4 +21,6 @@
- PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/alarms/MorningAlarm.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/MorningAlarm.ogg \
- $(LOCAL_PATH)/notifications/Pikachu.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Pikachu.ogg \
- - $(LOCAL_PATH)/ringtones/vibe.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/vibe.ogg
- + $(LOCAL_PATH)/ringtones/vibe.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/vibe.ogg \
- + $(LOCAL_PATH)/notifications/CyanMessage.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/CyanMessage \
- + $(LOCAL_PATH)/ringtones/Defined.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/Defined.ogg
- --- vendor/infinity/config/common.mk.orig 2024-09-16 18:23:03.541198993 +1000
- +++ vendor/infinity/config/common.mk 2024-09-16 18:26:01.377448372 +1000
- @@ -319,9 +319,9 @@
- # Sounds (default)
- PRODUCT_PROPERTY_OVERRIDES := \
- - ro.config.ringtone=vibe.ogg \
- - ro.config.notification_sound=Titan.ogg \
- - ro.config.alarm_alert=Oxygen.ogg
- + ro.config.ringtone=Defined.ogg \
- + ro.config.notification_sound=CyanMessage.ogg \
- + ro.config.alarm_alert=MorningAlarm.ogg
- include vendor/infinity/config/pixel_props.mk
- --- build/make/core/envsetup.mk.orig 2024-09-15 20:57:55.837739778 +1000
- +++ build/make/core/envsetup.mk 2024-09-16 18:29:05.557706019 +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-09-15 20:57:55.833739930 +1000
- +++ build/make/core/clear_vars.mk 2024-09-16 18:29:05.557706019 +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
