From e4e92bf2b00ed469141029640f192579c0ba1025 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 1 Oct 2016 17:09:04 -0500
Subject: Switch FFTS to linkotec branch for cross-arch support

---
 lib/ffts/java/android/.classpath                   |  9 +++
 lib/ffts/java/android/.project                     | 40 ++++++++++
 .../android/.settings/org.eclipse.jdt.core.prefs   |  4 +
 .../org.eclipse.ltk.core.refactoring.prefs         |  2 +
 lib/ffts/java/android/AndroidManifest.xml          |  7 ++
 lib/ffts/java/android/ant.properties               | 18 +++++
 lib/ffts/java/android/build.xml                    | 92 ++++++++++++++++++++++
 lib/ffts/java/android/jni/Android.mk               | 25 ++++++
 lib/ffts/java/android/jni/Application.mk           |  2 +
 lib/ffts/java/android/proguard-project.txt         | 20 +++++
 lib/ffts/java/android/project.properties           | 15 ++++
 11 files changed, 234 insertions(+)
 create mode 100644 lib/ffts/java/android/.classpath
 create mode 100644 lib/ffts/java/android/.project
 create mode 100644 lib/ffts/java/android/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 lib/ffts/java/android/.settings/org.eclipse.ltk.core.refactoring.prefs
 create mode 100644 lib/ffts/java/android/AndroidManifest.xml
 create mode 100644 lib/ffts/java/android/ant.properties
 create mode 100644 lib/ffts/java/android/build.xml
 create mode 100644 lib/ffts/java/android/jni/Android.mk
 create mode 100644 lib/ffts/java/android/jni/Application.mk
 create mode 100644 lib/ffts/java/android/proguard-project.txt
 create mode 100644 lib/ffts/java/android/project.properties

(limited to 'lib/ffts/java/android')

diff --git a/lib/ffts/java/android/.classpath b/lib/ffts/java/android/.classpath
new file mode 100644
index 0000000..46f15fa
--- /dev/null
+++ b/lib/ffts/java/android/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/lib/ffts/java/android/.project b/lib/ffts/java/android/.project
new file mode 100644
index 0000000..aff6a0c
--- /dev/null
+++ b/lib/ffts/java/android/.project
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ffts-android</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>src</name>
+			<type>2</type>
+			<locationURI>PARENT-1-PROJECT_LOC/src</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/lib/ffts/java/android/.settings/org.eclipse.jdt.core.prefs b/lib/ffts/java/android/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..b080d2d
--- /dev/null
+++ b/lib/ffts/java/android/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/lib/ffts/java/android/.settings/org.eclipse.ltk.core.refactoring.prefs b/lib/ffts/java/android/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..b196c64
--- /dev/null
+++ b/lib/ffts/java/android/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/lib/ffts/java/android/AndroidManifest.xml b/lib/ffts/java/android/AndroidManifest.xml
new file mode 100644
index 0000000..6475e8e
--- /dev/null
+++ b/lib/ffts/java/android/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="nz.waikato.ffts"
+      android:versionCode="1"
+      android:versionName="1.0">
+  <uses-sdk android:minSdkVersion="8" />
+</manifest> 
diff --git a/lib/ffts/java/android/ant.properties b/lib/ffts/java/android/ant.properties
new file mode 100644
index 0000000..95346d2
--- /dev/null
+++ b/lib/ffts/java/android/ant.properties
@@ -0,0 +1,18 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked into Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+source.dir=../src
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
diff --git a/lib/ffts/java/android/build.xml b/lib/ffts/java/android/build.xml
new file mode 100644
index 0000000..4d6cc3d
--- /dev/null
+++ b/lib/ffts/java/android/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="ffts" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/lib/ffts/java/android/jni/Android.mk b/lib/ffts/java/android/jni/Android.mk
new file mode 100644
index 0000000..879ef4d
--- /dev/null
+++ b/lib/ffts/java/android/jni/Android.mk
@@ -0,0 +1,25 @@
+LOCAL_PATH := $(call my-dir)
+
+TOP=../../..
+
+# Include the shared library
+#include $(CLEAR_VARS)
+#LOCAL_MODULE := ffts
+#LOCAL_SRC_FILES :=  ../../../src/.libs/libffts.so
+#include $(PREBUILT_SHARED_LIBRARY)
+
+# Include the static library in shared lib
+include $(CLEAR_VARS)
+LOCAL_MODULE := ffts
+LOCAL_SRC_FILES := $(TOP)/java/android/bin/lib/libffts.a
+LOCAL_EXPORT_C_INCLUDES := $(TOP)/include
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := ffts_jni
+LOCAL_CFLAGS := -I$(TOP)/include -I$(TOP)/java/jni -I$(TOP) -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
+LOCAL_SRC_FILES := $(TOP)/java/jni/ffts_jni.c
+LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -llog 
+LOCAL_STATIC_LIBRARIES := ffts
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/lib/ffts/java/android/jni/Application.mk b/lib/ffts/java/android/jni/Application.mk
new file mode 100644
index 0000000..12c9df6
--- /dev/null
+++ b/lib/ffts/java/android/jni/Application.mk
@@ -0,0 +1,2 @@
+# requires NEON atm
+APP_ABI := armeabi-v7a
diff --git a/lib/ffts/java/android/proguard-project.txt b/lib/ffts/java/android/proguard-project.txt
new file mode 100644
index 0000000..f2fe155
--- /dev/null
+++ b/lib/ffts/java/android/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/lib/ffts/java/android/project.properties b/lib/ffts/java/android/project.properties
new file mode 100644
index 0000000..88ca83f
--- /dev/null
+++ b/lib/ffts/java/android/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+android.library=true
+# Project target.
+target=android-10
-- 
cgit v1.2.3