diff options
| author | Rohan Martin <rohan.martin@thisisant.com> | 2012-12-07 10:47:24 -0700 |
|---|---|---|
| committer | Rohan Martin <rohan.martin@thisisant.com> | 2012-12-07 10:47:24 -0700 |
| commit | 274e0ddfa092938c5839643af6abed3e6e7ef773 (patch) | |
| tree | 64258b09cbadd7ce47b7d1f3d71880a43764b914 | |
| parent | 92fcc5790faf9a6d98f4ef75e1efd2cae3f05f00 (diff) | |
| download | android_external_ant-wireless_ant_native-274e0ddfa092938c5839643af6abed3e6e7ef773.tar.gz android_external_ant-wireless_ant_native-274e0ddfa092938c5839643af6abed3e6e7ef773.tar.bz2 android_external_ant-wireless_ant_native-274e0ddfa092938c5839643af6abed3e6e7ef773.zip | |
Pull in Android_System_ANT-HAL_1-4-0
| -rw-r--r-- | src/common/inc/ant_version.h | 54 | ||||
| -rw-r--r-- | src/vfs/Android.mk | 110 |
2 files changed, 82 insertions, 82 deletions
diff --git a/src/common/inc/ant_version.h b/src/common/inc/ant_version.h index 8270723..f6effae 100644 --- a/src/common/inc/ant_version.h +++ b/src/common/inc/ant_version.h @@ -1,27 +1,27 @@ -/* - * ANT Stack - * - * Copyright 2011 Dynastream Innovations - * - * 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. - */ - -#ifndef __ANT_VERSION_H -#define __ANT_VERSION_H - -#define LIBANT_STACK_MAJOR "1" -#define LIBANT_STACK_MINOR "3" -#define LIBANT_STACK_INCRE "0" - -#endif // __ANT_VERSION_H - +/*
+ * ANT Stack
+ *
+ * Copyright 2011 Dynastream Innovations
+ *
+ * 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.
+ */
+
+#ifndef __ANT_VERSION_H
+#define __ANT_VERSION_H
+
+#define LIBANT_STACK_MAJOR "1"
+#define LIBANT_STACK_MINOR "4"
+#define LIBANT_STACK_INCRE "0"
+
+#endif // __ANT_VERSION_H
+
diff --git a/src/vfs/Android.mk b/src/vfs/Android.mk index 969fa03..92ea171 100644 --- a/src/vfs/Android.mk +++ b/src/vfs/Android.mk @@ -1,55 +1,55 @@ -# -# Copyright (C) 2011 Dynastream Innovations -# -# 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. -# - -include $(CLEAR_VARS) - -LOCAL_CFLAGS := -g -c -W -Wall -O2 - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/src/common/inc \ - $(LOCAL_PATH)/$(ANT_DIR)/inc \ - -ifeq ($(BOARD_ANT_WIRELESS_DEVICE),"cg29xx") -LOCAL_C_INCLUDES += \ - $(ANT_DIR)/ste/cg29xx \ - -else ifeq ($(BOARD_ANT_WIRELESS_DEVICE),"vfs-prerelease") -LOCAL_C_INCLUDES += \ - $(ANT_DIR)/prerelease \ - -endif # BOARD_ANT_WIRELESS_DEVICE = "vfs-prerelease" - -LOCAL_SRC_FILES := \ - $(COMMON_DIR)/JAntNative.cpp \ - $(COMMON_DIR)/ant_utils.c \ - $(ANT_DIR)/ant_native_chardev.c \ - $(ANT_DIR)/ant_rx_chardev.c \ - -# JNI -LOCAL_C_INCLUDE += $(JNI_H_INCLUDE) - -LOCAL_SHARED_LIBRARIES += \ - libnativehelper \ - -# logging -LOCAL_SHARED_LIBRARIES += \ - libcutils \ - -LOCAL_MODULE_TAGS := optional -LOCAL_PRELINK_MODULE := false -LOCAL_MODULE := libantradio - -include $(BUILD_SHARED_LIBRARY) +#
+# Copyright (C) 2011 Dynastream Innovations
+#
+# 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.
+#
+
+include $(CLEAR_VARS)
+
+LOCAL_CFLAGS := -g -c -W -Wall -O2
+
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/src/common/inc \
+ $(LOCAL_PATH)/$(ANT_DIR)/inc \
+
+ifeq ($(BOARD_ANT_WIRELESS_DEVICE),"cg29xx")
+LOCAL_C_INCLUDES += \
+ $(LOCAL_PATH)/$(ANT_DIR)/ste/cg29xx \
+
+else ifeq ($(BOARD_ANT_WIRELESS_DEVICE),"vfs-prerelease")
+LOCAL_C_INCLUDES += \
+ $(LOCAL_PATH)/$(ANT_DIR)/prerelease \
+
+endif # BOARD_ANT_WIRELESS_DEVICE = "vfs-prerelease"
+
+LOCAL_SRC_FILES := \
+ $(COMMON_DIR)/JAntNative.cpp \
+ $(COMMON_DIR)/ant_utils.c \
+ $(ANT_DIR)/ant_native_chardev.c \
+ $(ANT_DIR)/ant_rx_chardev.c \
+
+# JNI
+LOCAL_C_INCLUDE += $(JNI_H_INCLUDE)
+
+LOCAL_SHARED_LIBRARIES += \
+ libnativehelper \
+
+# logging
+LOCAL_SHARED_LIBRARIES += \
+ libcutils \
+
+LOCAL_MODULE_TAGS := optional
+LOCAL_PRELINK_MODULE := false
+LOCAL_MODULE := libantradio
+
+include $(BUILD_SHARED_LIBRARY)
|