diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d791d8b0d..be48a5774a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: - uses: nttld/setup-ndk@v1 id: setup-ndk with: - ndk-version: r25c + ndk-version: r27b - name: Install JDK uses: actions/setup-java@v4 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 35b2c3713b..cd5d7a76d0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,11 +29,11 @@ jobs: id: setup-ndk uses: nttld/setup-ndk@v1 with: - ndk-version: r25c + ndk-version: r27b - name: Register NDK run: | echo $PATH - echo 'ndk.path=/opt/hostedtoolcache/ndk/r25c/x64' >> local.properties + echo 'ndk.path=/opt/hostedtoolcache/ndk/r27b/x64' >> local.properties - name: Write GPG Sec Ring run: echo '${{ secrets.GPG_KEY_CONTENTS }}' | base64 -d > /tmp/secring.gpg - name: Update gradle.properties diff --git a/animated-gif/src/main/jni/Application.mk b/animated-gif/src/main/jni/Application.mk index 0b9d5b9c8c..af48d7062d 100644 --- a/animated-gif/src/main/jni/Application.mk +++ b/animated-gif/src/main/jni/Application.mk @@ -11,7 +11,7 @@ APP_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST))) NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)../../../nativedeps/merge APP_STL := c++_static - +APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true # Make sure every shared lib includes a .note.gnu.build-id header APP_LDFLAGS := -Wl,--build-id diff --git a/buildSrc/src/main/java/com/facebook/fresco/buildsrc/GradleDeps.kt b/buildSrc/src/main/java/com/facebook/fresco/buildsrc/GradleDeps.kt index 051d7723cd..0c28b0260f 100644 --- a/buildSrc/src/main/java/com/facebook/fresco/buildsrc/GradleDeps.kt +++ b/buildSrc/src/main/java/com/facebook/fresco/buildsrc/GradleDeps.kt @@ -22,7 +22,7 @@ object GradleDeps { } object Native { - const val version = "25.2.9519653" + const val version = "27.1.12297006" } object Publishing { diff --git a/imagepipeline-native/src/main/jni/Application.mk b/imagepipeline-native/src/main/jni/Application.mk index a8ca56644e..e6ef70ffa0 100644 --- a/imagepipeline-native/src/main/jni/Application.mk +++ b/imagepipeline-native/src/main/jni/Application.mk @@ -11,7 +11,7 @@ APP_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST))) NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)../../../nativedeps/merge APP_STL := c++_static - +APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true # Make sure every shared lib includes a .note.gnu.build-id header APP_LDFLAGS := -Wl,--build-id diff --git a/imagepipeline-native/src/main/jni/imagepipeline/Android.mk b/imagepipeline-native/src/main/jni/imagepipeline/Android.mk index c5e4bea15f..870ccf9855 100644 --- a/imagepipeline-native/src/main/jni/imagepipeline/Android.mk +++ b/imagepipeline-native/src/main/jni/imagepipeline/Android.mk @@ -23,7 +23,7 @@ LOCAL_LDFLAGS += $(FRESCO_CPP_LDFLAGS) LOCAL_STATIC_LIBRARIES += bitmaps LOCAL_STATIC_LIBRARIES += memchunk -LOCAL_LDFLAGS += -Wl,--exclude-libs +LOCAL_LDFLAGS += -Wl include $(BUILD_SHARED_LIBRARY) $(call import-module,bitmaps) diff --git a/native-filters/src/main/jni/Application.mk b/native-filters/src/main/jni/Application.mk index 424dd3056f..5d8e1a9943 100644 --- a/native-filters/src/main/jni/Application.mk +++ b/native-filters/src/main/jni/Application.mk @@ -11,7 +11,7 @@ APP_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST))) NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)../../../nativedeps/merge APP_STL := c++_static - +APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true # Make sure every shared lib includes a .note.gnu.build-id header APP_LDFLAGS := -Wl,--build-id @@ -23,4 +23,4 @@ NDK_TOOLCHAIN_VERSION := clang # coming from other stl implementations as well # This hides all symbols exported from libgnustl_static -FRESCO_CPP_LDFLAGS := -Wl,--gc-sections \ No newline at end of file +FRESCO_CPP_LDFLAGS := -Wl,--gc-sections diff --git a/native-filters/src/main/jni/native-filters/Android.mk b/native-filters/src/main/jni/native-filters/Android.mk index dacf235a62..af3a6a39bd 100644 --- a/native-filters/src/main/jni/native-filters/Android.mk +++ b/native-filters/src/main/jni/native-filters/Android.mk @@ -22,7 +22,7 @@ LOCAL_LDLIBS := -llog -ljnigraphics LOCAL_LDFLAGS += $(FRESCO_CPP_LDFLAGS) LOCAL_STATIC_LIBRARIES += filters -LOCAL_LDFLAGS += -Wl,--exclude-libs +LOCAL_LDFLAGS += -Wl include $(BUILD_SHARED_LIBRARY) -$(call import-module,filters) \ No newline at end of file +$(call import-module,filters) diff --git a/native-imagetranscoder/src/main/jni/Application.mk b/native-imagetranscoder/src/main/jni/Application.mk index a8ca56644e..e6ef70ffa0 100644 --- a/native-imagetranscoder/src/main/jni/Application.mk +++ b/native-imagetranscoder/src/main/jni/Application.mk @@ -11,7 +11,7 @@ APP_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST))) NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)../../../nativedeps/merge APP_STL := c++_static - +APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true # Make sure every shared lib includes a .note.gnu.build-id header APP_LDFLAGS := -Wl,--build-id diff --git a/native-imagetranscoder/src/main/jni/third-party/libjpeg-turbo-2.1.5.1/Android.mk b/native-imagetranscoder/src/main/jni/third-party/libjpeg-turbo-2.1.5.1/Android.mk index 7f3567c6b7..d67099ca33 100644 --- a/native-imagetranscoder/src/main/jni/third-party/libjpeg-turbo-2.1.5.1/Android.mk +++ b/native-imagetranscoder/src/main/jni/third-party/libjpeg-turbo-2.1.5.1/Android.mk @@ -104,6 +104,5 @@ include $(CLEAR_VARS) LOCAL_MODULE:= fb_jpegturbo LOCAL_SRC_FILES := $(JPEGTURBO_SRC_FILES) LOCAL_CFLAGS := $(JPEGTURBO_CFLAGS) -LOCAL_CFLAGS += -mfpu=neon -mfloat-abi=softfp LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) include $(BUILD_STATIC_LIBRARY) diff --git a/static-webp/src/main/jni/Application.mk b/static-webp/src/main/jni/Application.mk index 0b9d5b9c8c..af48d7062d 100644 --- a/static-webp/src/main/jni/Application.mk +++ b/static-webp/src/main/jni/Application.mk @@ -11,7 +11,7 @@ APP_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST))) NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)../../../nativedeps/merge APP_STL := c++_static - +APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true # Make sure every shared lib includes a .note.gnu.build-id header APP_LDFLAGS := -Wl,--build-id diff --git a/ui-common/src/main/java/com/facebook/fresco/ui/common/BaseControllerListener2.kt b/ui-common/src/main/java/com/facebook/fresco/ui/common/BaseControllerListener2.kt index d6f953fb6f..8fce0c0570 100644 --- a/ui-common/src/main/java/com/facebook/fresco/ui/common/BaseControllerListener2.kt +++ b/ui-common/src/main/java/com/facebook/fresco/ui/common/BaseControllerListener2.kt @@ -28,6 +28,7 @@ open class BaseControllerListener2 : ControllerListener2 { companion object { private val NO_OP_LISTENER: ControllerListener2<*> = BaseControllerListener2() + @Suppress("UNCHECKED_CAST") @JvmStatic fun getNoOpListener(): ControllerListener2 = NO_OP_LISTENER as ControllerListener2 }