Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
VLC-Android
Commits
88ffd8f0
Commit
88ffd8f0
authored
Feb 03, 2011
by
JPeg
Browse files
Android/Makefile: rebuild libvlcjni when the sources change
parent
ae2e69c6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
88ffd8f0
# Sources and objects
# Sources and objects
JAVA_SOURCES
=
vlc-android/src/vlc/android/
*
.java
JAVA_SOURCES
=
vlc-android/src/vlc/android/
*
.java
JNI_SOURCES
=
vlc-android/jni/
*
.c vlc-android/jni/
*
.h
VLC_APK
=
vlc-android/bin/VLC-debug.apk
VLC_APK
=
vlc-android/bin/VLC-debug.apk
APK_MK
=
vlc-android/jni/Android.mk
APK_MK
=
vlc-android/jni/Android.mk
LIBVLCJNI
=
vlc-android/libs/armeabi/libvlcjni.so
LIBVLCJNI
=
vlc-android/libs/armeabi/libvlcjni.so
...
@@ -53,7 +54,7 @@ $(APK_MK):
...
@@ -53,7 +54,7 @@ $(APK_MK):
printf
"
\t
-ldl -lz -lm -logg -lvorbisenc -lvorbis -lFLAC -lspeex -ltheora -lavformat -lavcodec -lavcore -lavutil -lpostproc -lswscale -lmpeg2 -lgcc -lpng -ldca -ldvbpsi -ltwolame -lkate -llog -la52
\n
"
>>
$(APK_MK)
;
\
printf
"
\t
-ldl -lz -lm -logg -lvorbisenc -lvorbis -lFLAC -lspeex -ltheora -lavformat -lavcodec -lavcore -lavutil -lpostproc -lswscale -lmpeg2 -lgcc -lpng -ldca -ldvbpsi -ltwolame -lkate -llog -la52
\n
"
>>
$(APK_MK)
;
\
printf
"include
\$
$(BUILD_SHARED_LIBRARY)
\n
"
>>
$(APK_MK)
printf
"include
\$
$(BUILD_SHARED_LIBRARY)
\n
"
>>
$(APK_MK)
$(LIBVLCJNI)
:
$(APK_MK)
$(LIBVLCJNI)
:
$(JNI_SOURCES)
$(APK_MK)
@
echo
"=== Building libvlcjni ==="
@
echo
"=== Building libvlcjni ==="
@
cd
vlc-android/
;
\
@
cd
vlc-android/
;
\
$(ANDROID_NDK)
/ndk-build
$(ANDROID_NDK)
/ndk-build
...
@@ -84,7 +85,7 @@ distclean: clean
...
@@ -84,7 +85,7 @@ distclean: clean
rm
-f
vlc-android/local.properties
rm
-f
vlc-android/local.properties
install
:
install
:
@
echo
"=== Installing APK on remote device ==="
@
echo
"=== Installing APK on
a
remote device ==="
@
echo
"Waiting for device to be ready..."
&&
adb wait-for-device
@
echo
"Waiting for
a
device to be ready..."
&&
adb wait-for-device
@
echo
"Installing package"
&&
adb
install
-r
$(VLC_APK)
@
echo
"Installing package"
&&
adb
install
-r
$(VLC_APK)
Write
Preview
Supports
Markdown
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