[Android] Fix comments

Jean-Baptiste Kempf git at videolan.org
Fri Jun 22 17:13:27 CEST 2012


android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jun 22 17:12:52 2012 +0200| [fcaecb6d824055228ded0e199d31e31aa10fe767] | committer: Jean-Baptiste Kempf

Fix comments

> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=fcaecb6d824055228ded0e199d31e31aa10fe767
---

 compile.sh                 |    7 +++----
 vlc-android/jni/Android.mk |    4 ----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/compile.sh b/compile.sh
index ffbb8ba..bee33e2 100755
--- a/compile.sh
+++ b/compile.sh
@@ -1,9 +1,8 @@
 #! /bin/sh
 
-# Read the Android Wiki and setup all that stuff correctly.
-# Get the Android SDK Platform 2.1, 2.2 and 2.3 API : version 7, 8 and (9 or 10)
-# or modify numbers in configure.sh and vlc-android/default.properties.
-# Create an AVD with this platform.
+# 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.
 
 set -e
 
diff --git a/vlc-android/jni/Android.mk b/vlc-android/jni/Android.mk
index 3169ee0..a585e87 100644
--- a/vlc-android/jni/Android.mk
+++ b/vlc-android/jni/Android.mk
@@ -13,11 +13,7 @@ else
 ARCH=armeabi
 endif
 
-ifeq ($(NO_NDK_V7),1)
-CPP_STATIC=$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(ARCH)/libstdc++.a
-else
 CPP_STATIC=$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(ARCH)/libgnustl_static.a
-endif
 
 LOCAL_CFLAGS := -std=gnu99
 LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \



More information about the Android mailing list