Skip to content

Commit a780ad2

Browse files
committed
Do not copy unstripped libs.
1 parent f823c88 commit a780ad2

File tree

2 files changed

+15
-19
lines changed

2 files changed

+15
-19
lines changed

library/src/main/jni/CMakeLists.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ if (CGE_USE_VIDEO_MODULE)
7373
${CMAKE_CURRENT_SOURCE_DIR}/ffmpeg/${ANDROID_ABI}/libffmpeg.so)
7474

7575
set(CGE_VIDEO_MODULE "ffmpeg")
76-
if (DEFINED ANDROID_ABI)
77-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ffmpeg/${ANDROID_ABI}/libffmpeg.so
78-
${CMAKE_CURRENT_SOURCE_DIR}/../libs/${ANDROID_ABI}/libffmpeg.so COPYONLY)
79-
# set_target_properties(ffmpeg PROPERTIES
80-
# LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../libs/${ANDROID_ABI})
81-
# set_target_properties(ffmpeg PROPERTIES
82-
# ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../libs/${ANDROID_ABI})
83-
endif ()
76+
# if (DEFINED ANDROID_ABI)
77+
# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ffmpeg/${ANDROID_ABI}/libffmpeg.so
78+
# ${CMAKE_CURRENT_SOURCE_DIR}/../libs/${ANDROID_ABI}/libffmpeg.so COPYONLY)
79+
# # set_target_properties(ffmpeg PROPERTIES
80+
# # LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../libs/${ANDROID_ABI})
81+
# # set_target_properties(ffmpeg PROPERTIES
82+
# # ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../libs/${ANDROID_ABI})
83+
# endif ()
8484
endif ()
8585

8686
if (NOT DEFINED ANDROID_GRADLE OR NOT ANDROID_GRADLE)
@@ -98,12 +98,12 @@ file(GLOB_RECURSE CGE_EXT_SRC "${CMAKE_CURRENT_SOURCE_DIR}/custom/*.cpp")
9898

9999
add_library(CGEExt SHARED ${CGE_EXT_SRC})
100100

101-
if (DEFINED ANDROID_ABI)
102-
set_target_properties(CGE PROPERTIES
103-
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../libs/${ANDROID_ABI})
104-
set_target_properties(CGEExt PROPERTIES
105-
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../libs/${ANDROID_ABI})
106-
endif ()
101+
# if (DEFINED ANDROID_ABI)
102+
# set_target_properties(CGE PROPERTIES
103+
# LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../libs/${ANDROID_ABI})
104+
# set_target_properties(CGEExt PROPERTIES
105+
# LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../libs/${ANDROID_ABI})
106+
# endif ()
107107

108108
target_link_libraries(CGE
109109
${CGE_VIDEO_MODULE}

vscode_tasks.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
if [[ $# -eq 0 ]]; then
4-
echo "usage: [--clean] [--build] [--run]"
4+
echo "usage: [--debug|--release] [--clean] [--enable-cmake] [--setup-project] [--build] [--run]"
55
fi
66

77
cd "$(dirname "$0")"
@@ -108,10 +108,6 @@ while [[ $# > 0 ]]; do
108108
PARSE_KEY="$1"
109109

110110
case "$PARSE_KEY" in
111-
--run-only)
112-
runAndroidApp
113-
shift
114-
;;
115111
--rebuild-android-demo)
116112
cd "$PROJECT_DIR" && git clean -ffdx
117113
cleanProject

0 commit comments

Comments
 (0)