<NME> Android.mk
<BEF> # OpenNI 2.x Android makefile. 
# Copyright (C) 2012 PrimeSense Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#      http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License. 


# Check if we're building from OS or NDK
ifdef TARGET_BUILD_VARIANT
    $(info OpenNI2: Building from OS.)	
	
    OPENNI2_ANDROID_OS_BUILD := true
else
    $(info OpenNI2: Building from NDK.)
	
    OPENNI2_ANDROID_NDK_BUILD := true
endif

# Setup OpenNI2 local variables
OPENNI2_CFLAGS := -O3 -ftree-vectorize -ffast-math -funroll-loops -fPIC -fvisibility=hidden

ifeq ($(ARCH_ARM_HAVE_ARMV7A),true) 
    $(info OpenNI2: ARMV7A is enabled.)
	OPENNI2_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mtune=cortex-a9 -mfp=vfpv3-d16 -mfpu=vfp
endif

ifeq ($(ARCH_ARM_HAVE_NEON),true)
    $(info OpenNI2: NEON is enabled.)
	OPENNI2_CFLAGS += -mfpu=neon -DHAVE_NEON=1 -flax-vector-conversions
endif

# Recurse through all subdirs
include $(call all-subdir-makefiles)

# Cleanup the local variables
OPENNI2_CFLAGS := 

<MSG> Removed debug prints from the main Android make file.

<DFF> @@ -16,25 +16,19 @@
 
 # Check if we're building from OS or NDK
 ifdef TARGET_BUILD_VARIANT
-    $(info OpenNI2: Building from OS.)	
-	
-    OPENNI2_ANDROID_OS_BUILD := true
+	OPENNI2_ANDROID_OS_BUILD := true
 else
-    $(info OpenNI2: Building from NDK.)
-	
-    OPENNI2_ANDROID_NDK_BUILD := true
+	OPENNI2_ANDROID_NDK_BUILD := true
 endif
 
 # Setup OpenNI2 local variables
 OPENNI2_CFLAGS := -O3 -ftree-vectorize -ffast-math -funroll-loops -fPIC -fvisibility=hidden
 
 ifeq ($(ARCH_ARM_HAVE_ARMV7A),true) 
-    $(info OpenNI2: ARMV7A is enabled.)
-	OPENNI2_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mtune=cortex-a9 -mfp=vfpv3-d16 -mfpu=vfp
+	OPENNI2_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mtune=cortex-a9 -mfpu=vfp
 endif
 
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
-    $(info OpenNI2: NEON is enabled.)
 	OPENNI2_CFLAGS += -mfpu=neon -DHAVE_NEON=1 -flax-vector-conversions
 endif
 
@@ -42,4 +36,4 @@ endif
 include $(call all-subdir-makefiles)
 
 # Cleanup the local variables
-OPENNI2_CFLAGS := 
\ No newline at end of file
+OPENNI2_CFLAGS := 

{'commit': "diff --git a/Android.mk b/Android.mk\nindex bf743f3..4e3e26b 100644\n--- a/Android.mk\n+++ b/Android.mk\n@@ -16,25 +16,19 @@\n \n # Check if we're building from OS or NDK\n ifdef TARGET_BUILD_VARIANT\n-    $(info OpenNI2: Building from OS.)\t\n-\t\n-    OPENNI2_ANDROID_OS_BUILD := true\n+\tOPENNI2_ANDROID_OS_BUILD := true\n else\n-    $(info OpenNI2: Building from NDK.)\n-\t\n-    OPENNI2_ANDROID_NDK_BUILD := true\n+\tOPENNI2_ANDROID_NDK_BUILD := true\n endif\n \n # Setup OpenNI2 local variables\n OPENNI2_CFLAGS := -O3 -ftree-vectorize -ffast-math -funroll-loops -fPIC -fvisibility=hidden\n \n ifeq ($(ARCH_ARM_HAVE_ARMV7A),true) \n-    $(info OpenNI2: ARMV7A is enabled.)\n-\tOPENNI2_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mtune=cortex-a9 -mfp=vfpv3-d16 -mfpu=vfp\n+\tOPENNI2_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mtune=cortex-a9 -mfpu=vfp\n endif\n \n ifeq ($(ARCH_ARM_HAVE_NEON),true)\n-    $(info OpenNI2: NEON is enabled.)\n \tOPENNI2_CFLAGS += -mfpu=neon -DHAVE_NEON=1 -flax-vector-conversions\n endif\n \n@@ -42,4 +36,4 @@ endif\n include $(call all-subdir-makefiles)\n \n # Cleanup the local variables\n-OPENNI2_CFLAGS := \n\\ No newline at end of file\n+OPENNI2_CFLAGS := \n", 'commit_subject': 'Removed debug prints from the main Android make file.', 'repo_name': 'OpenNI/OpenNI2', 'committer': {'name': 'eddie.cohen', 'email': '1e537d25673622e1d4539f671eae90e034ae76b3@primesense.com', 'time_sec': '1361103969', 'tz_offset': '120', 'date': {'seconds': '1361103969'}}, 'commit_tree': '0eeddca76eb616166614f6fec86a563392fddbae', 'commit_message': 'Removed debug prints from the main Android make file.\n', 'language_name': 'C', 'license': 'apache-2.0', 'hunks': "@@ -16,25 +16,19 @@\n \n # Check if we're building from OS or NDK\n ifdef TARGET_BUILD_VARIANT\n-    $(info OpenNI2: Building from OS.)\t\n-\t\n-    OPENNI2_ANDROID_OS_BUILD := true\n+\tOPENNI2_ANDROID_OS_BUILD := true\n else\n-    $(info OpenNI2: Building from NDK.)\n-\t\n-    OPENNI2_ANDROID_NDK_BUILD := true\n+\tOPENNI2_ANDROID_NDK_BUILD := true\n endif\n \n # Setup OpenNI2 local variables\n OPENNI2_CFLAGS := -O3 -ftree-vectorize -ffast-math -funroll-loops -fPIC -fvisibility=hidden\n \n ifeq ($(ARCH_ARM_HAVE_ARMV7A),true) \n-    $(info OpenNI2: ARMV7A is enabled.)\n-\tOPENNI2_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mtune=cortex-a9 -mfp=vfpv3-d16 -mfpu=vfp\n+\tOPENNI2_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mtune=cortex-a9 -mfpu=vfp\n endif\n \n ifeq ($(ARCH_ARM_HAVE_NEON),true)\n-    $(info OpenNI2: NEON is enabled.)\n \tOPENNI2_CFLAGS += -mfpu=neon -DHAVE_NEON=1 -flax-vector-conversions\n endif\n \n@@ -42,4 +36,4 @@ endif\n include $(call all-subdir-makefiles)\n \n # Cleanup the local variables\n-OPENNI2_CFLAGS := \n\\ No newline at end of file\n+OPENNI2_CFLAGS := \n", 'addition_count': 4, 'deletion_count': 10, 'src_file': 'a/Android.mk', 'tgt_file': 'b/Android.mk', 'file_extension': '.mk', 'before_file': '# OpenNI 2.x Android makefile. \n# Copyright (C) 2012 PrimeSense Ltd.\n#\n# Licensed under the Apache License, Version 2.0 (the "License");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an "AS IS" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License. \n\n\n# Check if we\'re building from OS or NDK\nifdef TARGET_BUILD_VARIANT\n    $(info OpenNI2: Building from OS.)\t\n\t\n    OPENNI2_ANDROID_OS_BUILD := true\nelse\n    $(info OpenNI2: Building from NDK.)\n\t\n    OPENNI2_ANDROID_NDK_BUILD := true\nendif\n\n# Setup OpenNI2 local variables\nOPENNI2_CFLAGS := -O3 -ftree-vectorize -ffast-math -funroll-loops -fPIC -fvisibility=hidden\n\nifeq ($(ARCH_ARM_HAVE_ARMV7A),true) \n    $(info OpenNI2: ARMV7A is enabled.)\n\tOPENNI2_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mtune=cortex-a9 -mfp=vfpv3-d16 -mfpu=vfp\nendif\n\nifeq ($(ARCH_ARM_HAVE_NEON),true)\n    $(info OpenNI2: NEON is enabled.)\n\tOPENNI2_CFLAGS += -mfpu=neon -DHAVE_NEON=1 -flax-vector-conversions\nendif\n\n# Recurse through all subdirs\ninclude $(call all-subdir-makefiles)\n\n# Cleanup the local variables\nOPENNI2_CFLAGS := \n', 'message': 'Removed debug prints from the main Android make file.\n', 'author_name': 'eddie.cohen', 'lang': 'mk'}