Skip to content

Commit 766a877

Browse files
alanleedevfacebook-github-bot
authored andcommitted
Bump to NDK 27b + 16 KB page size
Reviewed By: oprisnik Differential Revision: D63514438 fbshipit-source-id: 568f6c1a7af864298f76cce3e9de4ce20c5aac64
1 parent f5d7c99 commit 766a877

File tree

12 files changed

+14
-14
lines changed

12 files changed

+14
-14
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: nttld/setup-ndk@v1
1717
id: setup-ndk
1818
with:
19-
ndk-version: r25c
19+
ndk-version: r27b
2020
- name: Install JDK
2121
uses: actions/setup-java@v4
2222
with:

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ jobs:
2929
id: setup-ndk
3030
uses: nttld/setup-ndk@v1
3131
with:
32-
ndk-version: r25c
32+
ndk-version: r27b
3333
- name: Register NDK
3434
run: |
3535
echo $PATH
36-
echo 'ndk.path=/opt/hostedtoolcache/ndk/r25c/x64' >> local.properties
36+
echo 'ndk.path=/opt/hostedtoolcache/ndk/r27b/x64' >> local.properties
3737
- name: Write GPG Sec Ring
3838
run: echo '${{ secrets.GPG_KEY_CONTENTS }}' | base64 -d > /tmp/secring.gpg
3939
- name: Update gradle.properties

animated-gif/src/main/jni/Application.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ APP_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
1111
NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)../../../nativedeps/merge
1212

1313
APP_STL := c++_static
14-
14+
APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true
1515
# Make sure every shared lib includes a .note.gnu.build-id header
1616
APP_LDFLAGS := -Wl,--build-id
1717

buildSrc/src/main/java/com/facebook/fresco/buildsrc/GradleDeps.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ object GradleDeps {
2222
}
2323

2424
object Native {
25-
const val version = "25.2.9519653"
25+
const val version = "27.1.12297006"
2626
}
2727

2828
object Publishing {

imagepipeline-native/src/main/jni/Application.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ APP_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
1111
NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)../../../nativedeps/merge
1212

1313
APP_STL := c++_static
14-
14+
APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true
1515
# Make sure every shared lib includes a .note.gnu.build-id header
1616
APP_LDFLAGS := -Wl,--build-id
1717

imagepipeline-native/src/main/jni/imagepipeline/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ LOCAL_LDFLAGS += $(FRESCO_CPP_LDFLAGS)
2323

2424
LOCAL_STATIC_LIBRARIES += bitmaps
2525
LOCAL_STATIC_LIBRARIES += memchunk
26-
LOCAL_LDFLAGS += -Wl,--exclude-libs
26+
LOCAL_LDFLAGS += -Wl
2727

2828
include $(BUILD_SHARED_LIBRARY)
2929
$(call import-module,bitmaps)

native-filters/src/main/jni/Application.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ APP_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
1111
NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)../../../nativedeps/merge
1212

1313
APP_STL := c++_static
14-
14+
APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true
1515
# Make sure every shared lib includes a .note.gnu.build-id header
1616
APP_LDFLAGS := -Wl,--build-id
1717

@@ -23,4 +23,4 @@ NDK_TOOLCHAIN_VERSION := clang
2323
# coming from other stl implementations as well
2424

2525
# This hides all symbols exported from libgnustl_static
26-
FRESCO_CPP_LDFLAGS := -Wl,--gc-sections
26+
FRESCO_CPP_LDFLAGS := -Wl,--gc-sections

native-filters/src/main/jni/native-filters/Android.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ LOCAL_LDLIBS := -llog -ljnigraphics
2222
LOCAL_LDFLAGS += $(FRESCO_CPP_LDFLAGS)
2323

2424
LOCAL_STATIC_LIBRARIES += filters
25-
LOCAL_LDFLAGS += -Wl,--exclude-libs
25+
LOCAL_LDFLAGS += -Wl
2626

2727
include $(BUILD_SHARED_LIBRARY)
28-
$(call import-module,filters)
28+
$(call import-module,filters)

native-imagetranscoder/src/main/jni/Application.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ APP_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
1111
NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)../../../nativedeps/merge
1212

1313
APP_STL := c++_static
14-
14+
APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true
1515
# Make sure every shared lib includes a .note.gnu.build-id header
1616
APP_LDFLAGS := -Wl,--build-id
1717

native-imagetranscoder/src/main/jni/third-party/libjpeg-turbo-2.1.5.1/Android.mk

-1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,5 @@ include $(CLEAR_VARS)
104104
LOCAL_MODULE:= fb_jpegturbo
105105
LOCAL_SRC_FILES := $(JPEGTURBO_SRC_FILES)
106106
LOCAL_CFLAGS := $(JPEGTURBO_CFLAGS)
107-
LOCAL_CFLAGS += -mfpu=neon -mfloat-abi=softfp
108107
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
109108
include $(BUILD_STATIC_LIBRARY)

static-webp/src/main/jni/Application.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ APP_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
1111
NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)../../../nativedeps/merge
1212

1313
APP_STL := c++_static
14-
14+
APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true
1515
# Make sure every shared lib includes a .note.gnu.build-id header
1616
APP_LDFLAGS := -Wl,--build-id
1717

ui-common/src/main/java/com/facebook/fresco/ui/common/BaseControllerListener2.kt

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ open class BaseControllerListener2<INFO> : ControllerListener2<INFO> {
2828
companion object {
2929
private val NO_OP_LISTENER: ControllerListener2<*> = BaseControllerListener2<Any?>()
3030

31+
@Suppress("UNCHECKED_CAST")
3132
@JvmStatic
3233
fun <I> getNoOpListener(): ControllerListener2<I> = NO_OP_LISTENER as ControllerListener2<I>
3334
}

0 commit comments

Comments
 (0)