Fix comments

fcaecb6d · Jean-Baptiste Kempf · 8218d7fa · fcaecb6d · fcaecb6d
Commit fcaecb6d authored Jun 22, 2012 by Jean-Baptiste Kempf
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 8 deletions

compile.sh compile.sh +3 -4

vlc-android/jni/Android.mk vlc-android/jni/Android.mk +0 -4

No files found.
--- a/compile.sh
+++ b/compile.sh
 #! /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


--- 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 \