Skip to content

Commit 4268781

Browse files
committed
android:don't hardcode shared library versions for apk build:
- use shell execution to find the shared libraries without the need to specify the exact version and bump it every time
1 parent 516da62 commit 4268781

File tree

1 file changed

+12
-26
lines changed

1 file changed

+12
-26
lines changed

platforms/android/app/jni/Android.mk

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,70 @@
11
LOCAL_PATH := $(call my-dir)
2-
BUILD_PATH=../../../../build-$(TARGET_ARCH_ABI)
2+
BUILD_PATH=$(LOCAL_PATH)/../../../../build-$(TARGET_ARCH_ABI)
33
SUBPROJECTS_PATH :=$(BUILD_PATH)/subprojects
44

5-
# TODO: don't hardcode the versions of the dependencies
6-
75
include $(CLEAR_VARS)
86
LOCAL_MODULE := SDL2
9-
LIB_PATH := $(SUBPROJECTS_PATH)/SDL2-2.30.3
10-
LOCAL_C_INCLUDES := $(LIB_PATH)/include
11-
LOCAL_SRC_FILES := $(LIB_PATH)/libsdl2.so
7+
LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libsdl2.so)
128
include $(PREBUILT_SHARED_LIBRARY)
139

1410

1511
include $(CLEAR_VARS)
1612
LOCAL_MODULE := freetype
17-
SO_PATH := $(SUBPROJECTS_PATH)/freetype-2.13.2
18-
LOCAL_SRC_FILES := $(SO_PATH)/libfreetype.so
13+
LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libfreetype.so)
1914
include $(PREBUILT_SHARED_LIBRARY)
2015

2116

2217
include $(CLEAR_VARS)
2318
LOCAL_MODULE := libpng
24-
SO_PATH := $(SUBPROJECTS_PATH)/libpng-1.6.43
25-
LOCAL_SRC_FILES := $(SO_PATH)/libpng16.so
19+
LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libpng16.so)
2620
include $(PREBUILT_SHARED_LIBRARY)
2721

2822

2923
include $(CLEAR_VARS)
3024
LOCAL_MODULE := SDL2_ttf
31-
LIB_PATH := $(SUBPROJECTS_PATH)/SDL2_ttf-2.20.1
32-
LOCAL_SRC_FILES := $(LIB_PATH)/libsdl2_ttf.so
25+
LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libsdl2_ttf.so)
3326
include $(PREBUILT_SHARED_LIBRARY)
3427

3528

3629
include $(CLEAR_VARS)
3730
LOCAL_MODULE := SDL2_mixer
38-
LIB_PATH := $(SUBPROJECTS_PATH)/SDL2_mixer-2.6.2
39-
LOCAL_SRC_FILES := $(LIB_PATH)/libsdl2mixer.so
31+
LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libsdl2mixer.so)
4032
include $(PREBUILT_SHARED_LIBRARY)
4133

4234

4335
include $(CLEAR_VARS)
4436
LOCAL_MODULE := libvorbis
45-
LIB_PATH := $(SUBPROJECTS_PATH)/libvorbis-1.3.7/lib
46-
LOCAL_SRC_FILES := $(LIB_PATH)/libvorbis.so
37+
LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libvorbis.so)
4738
include $(PREBUILT_SHARED_LIBRARY)
4839

4940

5041
include $(CLEAR_VARS)
5142
LOCAL_MODULE := libvorbisfile
52-
LIB_PATH := $(SUBPROJECTS_PATH)/libvorbis-1.3.7/lib
53-
LOCAL_SRC_FILES := $(LIB_PATH)/libvorbisfile.so
43+
LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libvorbisfile.so)
5444
include $(PREBUILT_SHARED_LIBRARY)
5545

5646

5747
include $(CLEAR_VARS)
5848
LOCAL_MODULE := libogg
59-
LIB_PATH := $(SUBPROJECTS_PATH)/libogg-1.3.5/src
60-
LOCAL_SRC_FILES := $(LIB_PATH)/libogg.so
49+
LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libogg.so)
6150
include $(PREBUILT_SHARED_LIBRARY)
6251

6352

6453
include $(CLEAR_VARS)
6554
LOCAL_MODULE := libflac
66-
LIB_PATH := $(SUBPROJECTS_PATH)/flac-1.4.3/src
67-
LOCAL_SRC_FILES := $(LIB_PATH)/libFLAC/libFLAC.so
55+
LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libFLAC.so)
6856
include $(PREBUILT_SHARED_LIBRARY)
6957

7058

7159
include $(CLEAR_VARS)
7260
LOCAL_MODULE := SDL2_image
73-
LIB_PATH := $(SUBPROJECTS_PATH)/SDL2_image-2.6.3
74-
LOCAL_SRC_FILES := $(LIB_PATH)/libsdl2image.so
61+
LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libsdl2image.so)
7562
include $(PREBUILT_SHARED_LIBRARY)
7663

7764

7865
include $(CLEAR_VARS)
7966
LOCAL_MODULE := libfmt
80-
LIB_PATH := $(SUBPROJECTS_PATH)/fmt-11.0.1
81-
LOCAL_SRC_FILES := $(LIB_PATH)/libfmt.so
67+
LOCAL_SRC_FILES := $(shell find "${SUBPROJECTS_PATH}" -name libfmt.so)
8268
include $(PREBUILT_SHARED_LIBRARY)
8369

8470

0 commit comments

Comments
 (0)