Remove opencv & facetrackr. You can get the legacy branch at 'face_features'

Author: wysaid

cgeDemo/src/main/java/org/wysaid/cgeDemo/MainActivity.java

@@ -14,12 +14,13 @@
 import android.widget.Button;
 import android.widget.LinearLayout;
 
-import org.wysaid.common.Common;
-import org.wysaid.nativePort.CGENativeLibrary;
-
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.wysaid.common.Common;
+import org.wysaid.myUtils.MsgUtil;
+import org.wysaid.nativePort.CGENativeLibrary;
+
 
 public class MainActivity extends AppCompatActivity {
 
@@ -206,6 +207,12 @@ public void setDemo(DemoClassDescription demo) {
 
         @Override
         public void onClick(final View v) {
+
+            if (mDemo.activityName == "FaceTrackingDemoActivity") {
+                MsgUtil.toastMsg(v.getContext(), "Error: Please checkout the branch 'face_features' for this demo!");
+                return;
+            }
+
             Log.i(LOG_TAG, String.format("%s is clicked!", mDemo.title));
             Class cls;
             try {

library/src/main/jni/buildJNI

@@ -1,73 +1,72 @@
 #!/bin/bash
 
-#replace the path below with your ndk-dir 
+#replace the path below with your ndk-dir
 #NDK=/Users/wangyang/android_dev/android-ndk
 
 if [[ "$NDK" == "" ]]; then
 
-echo "Please specify the NDK variable to your ndk-dir"
-exit
+    echo "Please specify the NDK variable to your ndk-dir"
+    exit
 
 fi
 
 cd $(dirname $0)
 
-for i in $*
-do
+for i in $*; do
 
-if [ "${i}" == "-r" ] || [ "${i}" == "--release" ]; then
+    if [ "${i}" == "-r" ] || [ "${i}" == "--release" ]; then
 
-export CGE_RELEASE_MODE=1
+        export CGE_RELEASE_MODE=1
 
-echo "release mode enabled!"
+        echo "release mode enabled!"
 
-fi
+    fi
 
-if [ "${i}" == "-d" ] || [ "${i}" == "--debug" ]; then
+    if [ "${i}" == "-d" ] || [ "${i}" == "--debug" ]; then
 
-export CGE_DEBUG_MODE=1
+        export CGE_DEBUG_MODE=1
 
-echo "debug mode enabled!"
+        echo "debug mode enabled!"
 
-fi
+    fi
 
-if [ "${i}" == "-b" ] || [ "${i}" == "-B" ]; then
+    if [ "${i}" == "-b" ] || [ "${i}" == "-B" ]; then
 
-BUILD_ARG=-B
+        BUILD_ARG=-B
 
-echo "force rebuild!"
+        echo "force rebuild!"
 
-fi
+    fi
 
-if [ "${i}" == "--noface" ] || [ "${i}" == "-n" ]; then
+    if [ "${i}" == "--noface" ] || [ "${i}" == "-n" ]; then
 
-NO_FACE=1
+        NO_FACE=1
 
-echo "disable face module!"
+        echo "disable face module!"
 
-fi
+    fi
 
-if [ "${i}" == "--leaktest" ] || [ "${i}" == "-lt" ] || [ "${i}" == "--lt" ]; then
+    if [ "${i}" == "--leaktest" ] || [ "${i}" == "-lt" ] || [ "${i}" == "--lt" ]; then
 
-export CGE_USE_LEAK_TEST=1
+        export CGE_USE_LEAK_TEST=1
 
-echo "leak test enabled!"
+        echo "leak test enabled!"
 
-fi
+    fi
 
 done
 
-if [[ "$NO_FACE" == "" ]]; then
+# if [[ "$NO_FACE" == "" ]]; then
 
-export CGE_USE_FACE_MODULE=1
+# export CGE_USE_FACE_MODULE=1
 
-fi
+# fi
 
 export CGE_USE_VIDEO_MODULE=1
 
 echo "The NDK dir is: ${NDK}, If the shell can not run normally, you should set the NDK variable to your local ndk-dir"
 
-THREADS=`getconf _NPROCESSORS_ONLN`
+THREADS=$(getconf _NPROCESSORS_ONLN)
 if [[ -z "$THREADS" ]] || [[ "$THREADS" -eq "0" ]]; then
     THREADS=8
 fi