Merge "cleaned code, added pinch gesture detector, better opengl context handling, fixed issues"

Author: Andrew Hsieh

ndk/platforms/android-17/samples/Teapot/assets/Shaders/ShaderPlain.fsh

@@ -21,7 +21,7 @@ void main()
 {
 #if USE_PHONG
     mediump vec3 halfVector = normalize(-vLight0 + position);
-    mediump float NdotH = max(dot(normal, halfVector), 0.0);
+    mediump float NdotH = max(dot(normalize(normal), halfVector), 0.0);
     mediump float fPower = vMaterialSpecular.w;
     mediump float specular = pow(NdotH, fPower);
 

ndk/platforms/android-17/samples/Teapot/jni/Android.mk

@@ -5,21 +5,16 @@ include $(CLEAR_VARS)
 LOCAL_MODULE    := NativeActivity
 LOCAL_SRC_FILES := TeapotNativeActivity.cpp \
 TeapotRenderer.cpp \
-NDKSupport/JNIHelper.cpp \
-NDKSupport/shader.cpp \
-NDKSupport/vecmath.cpp \
-NDKSupport/gestureDetector.cpp \
-NDKSupport/perfMonitor.cpp \
-NDKSupport/tapCamera.cpp \
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/NDKSupport
+LOCAL_C_INCLUDES :=
 
 LOCAL_CFLAGS :=
 
 LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv2
-LOCAL_STATIC_LIBRARIES := cpufeatures android_native_app_glue
+LOCAL_STATIC_LIBRARIES := cpufeatures android_native_app_glue helper
 
 include $(BUILD_SHARED_LIBRARY)
 
+$(call import-module,android/helper)
 $(call import-module,android/native_app_glue)
-$(call import-module,android/cpufeatures)
+$(call import-module,android/cpufeatures)