shithub: openh264

Download patch

ref: b5a9a83c694e02539ed05bc13d658357bf333fb4
parent: 42e80cec0d32334633457ff11fa3425aa090ab69
author: Martin Storsjö <[email protected]>
date: Thu Feb 20 06:42:23 EST 2014

Run ndk-build from the android project top level directory

One doesn't need to run the ndk-build command from within the
jni subdirectory, calling it from the project top level directory
works just as well.

Also remove an unnecessary step of cd ../../../.. at the end -
since all make commands are run in a subshell, we don't need to
restore the current working directory afterwards.

--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -41,7 +41,7 @@
 binaries : decdemo encdemo
 
 decdemo: libraries
-	cd ./codec/build/android/dec/jni && $(NDKROOT)/ndk-build -B APP_ABI=$(APP_ABI) && cd .. && android update project -t $(TARGET) -p . && ant debug && cd ../../../..
+	cd ./codec/build/android/dec && $(NDKROOT)/ndk-build -B APP_ABI=$(APP_ABI) && android update project -t $(TARGET) -p . && ant debug
 
 encdemo: libraries
-	cd ./codec/build/android/enc/jni && $(NDKROOT)/ndk-build -B APP_ABI=$(APP_ABI) && cd .. && android update project -t $(TARGET) -p . && ant debug && cd ../../../..
+	cd ./codec/build/android/enc && $(NDKROOT)/ndk-build -B APP_ABI=$(APP_ABI) && android update project -t $(TARGET) -p . && ant debug