Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLC-Android
Commits
52c1f9d3
Commit
52c1f9d3
authored
Oct 27, 2017
by
Thomas Guillem
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: add --no-ml to disable medialibrary
parent
b775dbba
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
2 deletions
+22
-2
compile-libvlc.sh
compile-libvlc.sh
+10
-1
compile.sh
compile.sh
+6
-0
libvlc/jni/Android.mk
libvlc/jni/Android.mk
+6
-1
No files found.
compile-libvlc.sh
View file @
52c1f9d3
...
...
@@ -18,6 +18,7 @@ checkfail()
MEDIALIBRARY_HASH
=
6bfe3c19
BUILD_ML
=
1
RELEASE
=
0
ASAN
=
0
while
[
$#
-gt
0
]
;
do
...
...
@@ -37,6 +38,9 @@ while [ $# -gt 0 ]; do
--asan
)
ASAN
=
1
;;
--no-ml
)
BUILD_ML
=
0
;;
release|--release
)
RELEASE
=
1
;;
...
...
@@ -705,6 +709,8 @@ fi
# MEDIALIBRARY #
################
if
[
${
BUILD_ML
}
=
"1"
]
;
then
if
[
!
-d
"
${
SRC_DIR
}
/medialibrary"
]
;
then
mkdir
"
${
SRC_DIR
}
/medialibrary"
fi
...
...
@@ -849,6 +855,8 @@ fi
# LINKING #
###########
fi
# ${BUILD_ML} = "1"
echo
-e
"ndk-build vlc"
$ANDROID_NDK
/ndk-build
$OSCMD
-C
libvlc
\
...
...
@@ -867,7 +875,8 @@ $ANDROID_NDK/ndk-build$OSCMD -C libvlc \
APP_ABI
=
${
ANDROID_ABI
}
\
NDK_PROJECT_PATH
=
jni
\
NDK_TOOLCHAIN_VERSION
=
clang
\
NDK_DEBUG
=
${
NDK_DEBUG
}
NDK_DEBUG
=
${
NDK_DEBUG
}
\
BUILD_ML
=
${
BUILD_ML
}
$ANDROID_NDK
/ndk-build
$OSCMD
-C
libvlc
\
APP_BUILD_SCRIPT
=
jni/loader/Android.mk
\
...
...
compile.sh
View file @
52c1f9d3
...
...
@@ -68,6 +68,9 @@ while [ $# -gt 0 ]; do
--asan
)
ASAN
=
1
;;
--no-ml
)
NO_ML
=
1
;;
*
)
diagnostic
"
$0
: Invalid option '
$1
'."
diagnostic
"
$0
: Try --help for more information."
...
...
@@ -260,6 +263,9 @@ fi
if
[
"
$ASAN
"
=
1
]
;
then
OPTS
=
"
$OPTS
--asan"
fi
if
[
"
$NO_ML
"
=
1
]
;
then
OPTS
=
"
$OPTS
--no-ml"
fi
./compile-libvlc.sh
$OPTS
...
...
libvlc/jni/Android.mk
View file @
52c1f9d3
...
...
@@ -37,9 +37,14 @@ LOCAL_LDLIBS := \
$(VLC_LDFLAGS)
\
-llog
LOCAL_WHOLE_STATIC_LIBRARIES
:=
libvlcjni_static libmla
LOCAL_WHOLE_STATIC_LIBRARIES
:=
libvlcjni_static
ifeq
($(BUILD_ML), 1)
LOCAL_WHOLE_STATIC_LIBRARIES
+=
libmla
endif
include
$(BUILD_SHARED_LIBRARY)
ifeq
($(BUILD_ML), 1)
JNILOADER_INCLUDES
:=
$(LOCAL_PATH)
/loader
$(call
import-add-path,
$(MEDIALIBRARY_JNI_DIR))
$(call
import-module,
.)
endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment