Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Ewout ter Hoeven
VLC-Android
Commits
e8a66be2
Commit
e8a66be2
authored
Nov 13, 2014
by
Geoffrey Métais
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
maintain Makefile to build libvlc with compile.sh
parent
110a2ac9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
20 deletions
+23
-20
Makefile
Makefile
+17
-14
compile.sh
compile.sh
+4
-4
libvlc/build.xml
libvlc/build.xml
+1
-1
vlc-android/project.properties
vlc-android/project.properties
+1
-1
No files found.
Makefile
View file @
e8a66be2
...
...
@@ -4,9 +4,11 @@ export ANDROID_HOME=$(ANDROID_SDK)
ARCH
=
$(ANDROID_ABI)
SRC
=
vlc-android
JAVA_SOURCES
=
$(
shell
find
$(SRC)
/src/org/videolan
-name
"*.java"
-o
-name
"*.aidl"
)
JAVA_SOURCES
+=
$(
shell
find
$(SRC)
/res
-name
"*.xml"
-o
-name
"*.png"
)
SRC
=
libvlc
APP_SRC
=
vlc-android
JAVA_SOURCES
=
$(
shell
find
$(APP_SRC)
/src/org/videolan
-name
"*.java"
-o
-name
"*.aidl"
)
JAVA_SOURCES
+=
$(
shell
find
$(SRC)
/src/org/videolan
-name
"*.java"
-o
-name
"*.aidl"
)
JAVA_SOURCES
+=
$(
shell
find
$(APP_SRC)
/res
-name
"*.xml"
-o
-name
"*.png"
)
JNI_SOURCES
=
$(SRC)
/jni/
*
.c
$(SRC)
/jni/
*
.h
LIBVLC_LIBS
=
libvlcjni
...
...
@@ -38,11 +40,11 @@ endif
ifeq
($(RELEASE),1)
ANT_TARGET
=
release
VLC_APK
=
$(SRC)
/bin/VLC-release-unsigned.apk
VLC_APK
=
$(
APP_
SRC)
/bin/VLC-release-unsigned.apk
NDK_DEBUG
=
0
else
ANT_TARGET
=
debug
VLC_APK
=
$(SRC)
/bin/VLC-debug.apk
VLC_APK
=
$(
APP_
SRC)
/bin/VLC-debug.apk
NDK_DEBUG
=
1
endif
...
...
@@ -50,11 +52,11 @@ define build_apk
@echo
@echo
"=== Building $(VLC_APK) for $(ARCH) ==="
@echo
date
+
"%Y-%m-%d"
>
$(SRC)/assets/builddate.txt
echo
`id
-u
-n`@`hostname`
>
$(SRC)/assets/builder.txt
git
rev-parse
--short
HEAD
>
$(SRC)/assets/revision.txt
./gen-env.sh
$(SRC)
$(VERBOSE)cd
$(SRC)
&&
ant
$(ANT_OPTS)
$(ANT_TARGET)
date
+
"%Y-%m-%d"
>
$(
APP_
SRC)/assets/builddate.txt
echo
`id
-u
-n`@`hostname`
>
$(
APP_
SRC)/assets/builder.txt
git
rev-parse
--short
HEAD
>
$(
APP_
SRC)/assets/revision.txt
./gen-env.sh
$(
APP_
SRC)
$(VERBOSE)cd
$(
APP_
SRC)
&&
ant
$(ANT_OPTS)
$(ANT_TARGET)
endef
$(VLC_APK)
:
$(LIBVLCJNI) $(JAVA_SOURCES)
...
...
@@ -114,11 +116,12 @@ apkclean:
rm
-f
$(VLC_APK)
lightclean
:
cd
$(SRC)
&&
rm
-rf
libs obj bin
$(VLC_APK)
cd
$(SRC)
&&
rm
-rf
libs obj
cd
$(APP_SRC)
&&
rm
-rf
bin
$(VLC_APK)
rm
-f
$(PRIVATE_LIBDIR)
/
*
.so
$(PRIVATE_LIBDIR)
/
*
.c
clean
:
lightclean
rm
-rf
$(SRC)
/gen java-libs/
*
/gen java-libs/
*
/bin .sdk vlc-sdk/ vlc-sdk.7z
rm
-rf
$(
APP_
SRC)
/gen java-libs/
*
/gen java-libs/
*
/bin .sdk vlc-sdk/ vlc-sdk.7z
jniclean
:
lightclean
rm
-f
$(LIBVLCJNI)
$(LIBVLCJNI_H)
...
...
@@ -156,9 +159,9 @@ vlc-sdk.7z: .sdk
.sdk
:
mkdir
-p
vlc-sdk/libs
cd
vlc
-android
;
cp
-r
libs/
*
../vlc-sdk/libs
cd
lib
vlc
;
cp
-r
libs/
*
../vlc-sdk/libs
mkdir
-p
vlc-sdk/src/org/videolan
cp
-r
vlc
-android
/src/org/videolan/libvlc vlc-sdk/src/org/videolan
cp
-r
lib
vlc/src/org/videolan/libvlc vlc-sdk/src/org/videolan
touch
$@
.PHONY
:
lightclean clean jniclean distclean distclean-run apkclean apkclean-run install run build-and-run
compile.sh
View file @
e8a66be2
...
...
@@ -2,7 +2,7 @@
# Read the Android Wiki http://wiki.videolan.org/AndroidCompile
# Setup all that stuff correctly.
# Get the latest Android SDK Platform or modify numbers in configure.sh and vlc
-android
/default.properties.
# Get the latest Android SDK Platform or modify numbers in configure.sh and
lib
vlc/default.properties.
set
-e
...
...
@@ -63,11 +63,11 @@ if [ `set -- ${ANDROID_ABI}; echo $#` -gt 1 ]; then
NO_FPU
=
$NO_FPU
NO_ARMV6
=
$NO_ARMV6
ANDROID_ABI
=
$i
\
./compile.sh
$*
--jni
||
{
echo
"
$i
build KO"
;
exit
1
;
}
mkdir
-p
obj/
cp
-r
vlc
-android
/libs/
$i
obj
cp
-r
lib
vlc/libs/
$i
obj
echo
"
$i
build OK"
done
for
i
in
${
ANDROID_ABI_LIST
}
;
do
cp
-r
obj/
$i
vlc
-android
/libs/
cp
-r
obj/
$i
lib
vlc/libs/
rm
-rf
obj/
$i
done
if
[
"
$JNI
"
=
0
]
;
then
...
...
@@ -348,7 +348,7 @@ cd ../.. && mkdir -p build-android-${TARGET_TUPLE} && cd build-android-${TARGET_
if
[
"
$JNI
"
=
1
]
;
then
CLEAN
=
"jniclean"
TARGET
=
"vlc
-android
/obj/local/
${
ANDROID_ABI
}
/libvlcjni.so"
TARGET
=
"
lib
vlc/obj/local/
${
ANDROID_ABI
}
/libvlcjni.so"
else
CLEAN
=
"distclean"
TARGET
=
...
...
libvlc/build.xml
View file @
e8a66be2
<?xml version="1.0" encoding="UTF-8"?>
<project
name=
"lib
VLC
"
default=
"help"
>
<project
name=
"lib
vlc
"
default=
"help"
>
<!-- The local.properties file is created and updated by the 'android' tool.
It contains the path to the SDK. It should *NOT* be checked into
...
...
vlc-android/project.properties
View file @
e8a66be2
...
...
@@ -14,4 +14,4 @@ target=android-21
android.library.reference.1
=
../java-libs/appcompat
android.library.reference.2
=
../java-libs/WheelView
android.library.reference.3
=
../java-libs/cardview
android.library.reference.4
=
../lib
VLC
android.library.reference.4
=
../lib
vlc
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