Delete NDK.

It is being moved to a standalone project.

Change-Id: If863753b9bf10ec2b7351fd39eccf28a989102f7
diff --git a/ndk/.gitignore b/ndk/.gitignore
deleted file mode 100644
index 5f466c9..0000000
--- a/ndk/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-build/prebuilt
-out
-apps/*/project/libs
-.gitignore
-
diff --git a/ndk/Android.mk b/ndk/Android.mk
deleted file mode 100644
index 1ce424d..0000000
--- a/ndk/Android.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Please keep this file empty. It is only used to avoid breaking the Android build
-# when the NDK sources are stored in the git repository alongside the rest of the
-# platform.
diff --git a/ndk/GNUmakefile b/ndk/GNUmakefile
deleted file mode 100644
index 3cd1635..0000000
--- a/ndk/GNUmakefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-
-# DO NOT MODIFY THIS FILE
-include build/core/main.mk
-# END OF FILE
diff --git a/ndk/README.TXT b/ndk/README.TXT
deleted file mode 100644
index 48f94eb..0000000
--- a/ndk/README.TXT
+++ /dev/null
@@ -1,35 +0,0 @@
-            Android Native Development Kit (NDK)
-
-
-Welcome, this NDK is designed to allow Android application developers
-to include native code in their Android application packages, compiled
-as JNI shared libraries.
-
-See docs/CHANGES.TXT for a list of changes since the previous release.
-
-A high-level overview of the NDK's features and limitations can be found
-in docs/OVERVIEW.TXT. Please read this document as it contains crucial
-information for correct usage.
-
-See docs/STABLE-APIS.TXT for the list of frozen binary APIs exposed by
-this NDK, as well as the corresponding system image versions that support
-them.
-
-Before using the NDK, you will need to follow the steps described by
-docs/INSTALL.TXT which lists the NDK pre-requisites and the steps needed
-to set it up properly on your machine.
-
-We recommend developers to make themselves familiar with JNI concepts. Also
-note that the NDK is *not* a good way to write non-JNI native code for the
-Android platform.
-
-See docs/HOWTO.TXT for a few useful tips and tricks when using the NDK.
-
-See docs/SYSTEM-ISSUES.TXT for a list of important issues related to
-the Android system images that all NDK developers should be aware of.
-
-Finally, discussions related to the Android NDK happen on the public
-"android-ndk" forum located at the following address:
-
-    http://groups.google.com/group/android-ndk
-
diff --git a/ndk/apps/hello-gl2/Application.mk b/ndk/apps/hello-gl2/Application.mk
deleted file mode 100644
index 6f884bf..0000000
--- a/ndk/apps/hello-gl2/Application.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-APP_PROJECT_PATH := $(call my-dir)/project
-APP_MODULES      := libgl2jni
-
diff --git a/ndk/apps/hello-gl2/project/Android.mk b/ndk/apps/hello-gl2/project/Android.mk
deleted file mode 100644
index 2e36165..0000000
--- a/ndk/apps/hello-gl2/project/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(LOCAL_PATH)/jni
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := libgl2jni
-LOCAL_CFLAGS    := -Werror
-LOCAL_SRC_FILES := gl_code.cpp
-LOCAL_LDLIBS    := -llog -lGLESv2
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/ndk/apps/hello-gl2/project/AndroidManifest.xml b/ndk/apps/hello-gl2/project/AndroidManifest.xml
deleted file mode 100644
index 5a4d5f2..0000000
--- a/ndk/apps/hello-gl2/project/AndroidManifest.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2009, The Android Open Source Project
-**
-** 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.
-*/
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.gl2jni">
-    <application
-            android:label="@string/gl2jni_activity">
-        <activity android:name="GL2JNIActivity"
-                android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-            	android:launchMode="singleTask"
-            	android:configChanges="orientation|keyboardHidden">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    <uses-feature android:glEsVersion="0x00020000"/>
-    <uses-sdk android:minSdkVersion="5"/>
-</manifest>
diff --git a/ndk/apps/hello-gl2/project/default.properties b/ndk/apps/hello-gl2/project/default.properties
deleted file mode 100644
index dbf05f2..0000000
--- a/ndk/apps/hello-gl2/project/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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 use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-5
diff --git a/ndk/apps/hello-gl2/project/jni/Android.mk b/ndk/apps/hello-gl2/project/jni/Android.mk
deleted file mode 100644
index a995c86..0000000
--- a/ndk/apps/hello-gl2/project/jni/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := libgl2jni
-LOCAL_CFLAGS    := -Werror
-LOCAL_SRC_FILES := gl_code.cpp
-LOCAL_LDLIBS    := -llog -lGLESv2
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/ndk/apps/hello-gl2/project/jni/gl_code.cpp b/ndk/apps/hello-gl2/project/jni/gl_code.cpp
deleted file mode 100644
index 42d99d3..0000000
--- a/ndk/apps/hello-gl2/project/jni/gl_code.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * 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.
- */
-
-// OpenGL ES 2.0 code
-
-#include <jni.h>
-#include <android/log.h>
-
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-
-#define  LOG_TAG    "libgl2jni"
-#define  LOGI(...)  __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__)
-#define  LOGE(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
-
-static void printGLString(const char *name, GLenum s) {
-    const char *v = (const char *) glGetString(s);
-    LOGI("GL %s = %s\n", name, v);
-}
-
-static void checkGlError(const char* op) {
-    for (GLint error = glGetError(); error; error
-            = glGetError()) {
-        LOGI("after %s() glError (0x%x)\n", op, error);
-    }
-}
-
-static const char gVertexShader[] = 
-    "attribute vec4 vPosition;\n"
-    "void main() {\n"
-    "  gl_Position = vPosition;\n"
-    "}\n";
-
-static const char gFragmentShader[] = 
-    "precision mediump float;\n"
-    "void main() {\n"
-    "  gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);\n"
-    "}\n";
-
-GLuint loadShader(GLenum shaderType, const char* pSource) {
-    GLuint shader = glCreateShader(shaderType);
-    if (shader) {
-        glShaderSource(shader, 1, &pSource, NULL);
-        glCompileShader(shader);
-        GLint compiled = 0;
-        glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
-        if (!compiled) {
-            GLint infoLen = 0;
-            glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLen);
-            if (infoLen) {
-                char* buf = (char*) malloc(infoLen);
-                if (buf) {
-                    glGetShaderInfoLog(shader, infoLen, NULL, buf);
-                    LOGE("Could not compile shader %d:\n%s\n",
-                            shaderType, buf);
-                    free(buf);
-                }
-                glDeleteShader(shader);
-                shader = 0;
-            }
-        }
-    }
-    return shader;
-}
-
-GLuint createProgram(const char* pVertexSource, const char* pFragmentSource) {
-    GLuint vertexShader = loadShader(GL_VERTEX_SHADER, pVertexSource);
-    if (!vertexShader) {
-        return 0;
-    }
-
-    GLuint pixelShader = loadShader(GL_FRAGMENT_SHADER, pFragmentSource);
-    if (!pixelShader) {
-        return 0;
-    }
-
-    GLuint program = glCreateProgram();
-    if (program) {
-        glAttachShader(program, vertexShader);
-        checkGlError("glAttachShader");
-        glAttachShader(program, pixelShader);
-        checkGlError("glAttachShader");
-        glLinkProgram(program);
-        GLint linkStatus = GL_FALSE;
-        glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
-        if (linkStatus != GL_TRUE) {
-            GLint bufLength = 0;
-            glGetProgramiv(program, GL_INFO_LOG_LENGTH, &bufLength);
-            if (bufLength) {
-                char* buf = (char*) malloc(bufLength);
-                if (buf) {
-                    glGetProgramInfoLog(program, bufLength, NULL, buf);
-                    LOGE("Could not link program:\n%s\n", buf);
-                    free(buf);
-                }
-            }
-            glDeleteProgram(program);
-            program = 0;
-        }
-    }
-    return program;
-}
-
-GLuint gProgram;
-GLuint gvPositionHandle;
-
-bool setupGraphics(int w, int h) {
-    printGLString("Version", GL_VERSION);
-    printGLString("Vendor", GL_VENDOR);
-    printGLString("Renderer", GL_RENDERER);
-    printGLString("Extensions", GL_EXTENSIONS);
-
-    LOGI("setupGraphics(%d, %d)", w, h);
-    gProgram = createProgram(gVertexShader, gFragmentShader);
-    if (!gProgram) {
-        LOGE("Could not create program.");
-        return false;
-    }
-    gvPositionHandle = glGetAttribLocation(gProgram, "vPosition");
-    checkGlError("glGetAttribLocation");
-    LOGI("glGetAttribLocation(\"vPosition\") = %d\n",
-            gvPositionHandle);
-
-    glViewport(0, 0, w, h);
-    checkGlError("glViewport");
-    return true;
-}
-
-const GLfloat gTriangleVertices[] = { 0.0f, 0.5f, -0.5f, -0.5f,
-        0.5f, -0.5f };
-
-void renderFrame() {
-    static float grey;
-    grey += 0.01f;
-    if (grey > 1.0f) {
-        grey = 0.0f;
-    }
-    glClearColor(grey, grey, grey, 1.0f);
-    checkGlError("glClearColor");
-    glClear( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
-    checkGlError("glClear");
-
-    glUseProgram(gProgram);
-    checkGlError("glUseProgram");
-
-    glVertexAttribPointer(gvPositionHandle, 2, GL_FLOAT, GL_FALSE, 0, gTriangleVertices);
-    checkGlError("glVertexAttribPointer");
-    glEnableVertexAttribArray(gvPositionHandle);
-    checkGlError("glEnableVertexAttribArray");
-    glDrawArrays(GL_TRIANGLES, 0, 3);
-    checkGlError("glDrawArrays");
-}
-
-extern "C" {
-    JNIEXPORT void JNICALL Java_com_android_gl2jni_GL2JNILib_init(JNIEnv * env, jobject obj,  jint width, jint height);
-    JNIEXPORT void JNICALL Java_com_android_gl2jni_GL2JNILib_step(JNIEnv * env, jobject obj);
-};
-
-JNIEXPORT void JNICALL Java_com_android_gl2jni_GL2JNILib_init(JNIEnv * env, jobject obj,  jint width, jint height)
-{
-    setupGraphics(width, height);
-}
-
-JNIEXPORT void JNICALL Java_com_android_gl2jni_GL2JNILib_step(JNIEnv * env, jobject obj)
-{
-    renderFrame();
-}
diff --git a/ndk/apps/hello-gl2/project/res/values/strings.xml b/ndk/apps/hello-gl2/project/res/values/strings.xml
deleted file mode 100644
index e3f7331..0000000
--- a/ndk/apps/hello-gl2/project/res/values/strings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2006, The Android Open Source Project
-**
-** 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.
-*/
--->
-
-<!-- This file contains resource definitions for displayed strings, allowing
-     them to be changed based on the locale and options. -->
-
-<resources>
-    <!-- Simple strings. -->
-    <string name="gl2jni_activity">GL2JNI</string>
-
-</resources>
-
diff --git a/ndk/apps/hello-gl2/project/src/com/android/gl2jni/GL2JNIActivity.java b/ndk/apps/hello-gl2/project/src/com/android/gl2jni/GL2JNIActivity.java
deleted file mode 100644
index c366a2c..0000000
--- a/ndk/apps/hello-gl2/project/src/com/android/gl2jni/GL2JNIActivity.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * 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.
- */
-
-package com.android.gl2jni;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.WindowManager;
-
-import java.io.File;
-
-
-public class GL2JNIActivity extends Activity {
-
-    GL2JNIView mView;
-
-    @Override protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        mView = new GL2JNIView(getApplication());
-	setContentView(mView);
-    }
-
-    @Override protected void onPause() {
-        super.onPause();
-        mView.onPause();
-    }
-
-    @Override protected void onResume() {
-        super.onResume();
-        mView.onResume();
-    }
-}
diff --git a/ndk/apps/hello-gl2/project/src/com/android/gl2jni/GL2JNILib.java b/ndk/apps/hello-gl2/project/src/com/android/gl2jni/GL2JNILib.java
deleted file mode 100644
index 040a984..0000000
--- a/ndk/apps/hello-gl2/project/src/com/android/gl2jni/GL2JNILib.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * 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.
- */
-
-package com.android.gl2jni;
-
-// Wrapper for native library
-
-public class GL2JNILib {
-
-     static {
-         System.loadLibrary("gl2jni");
-     }
-
-    /**
-     * @param width the current view width
-     * @param height the current view height
-     */
-     public static native void init(int width, int height);
-     public static native void step();
-}
diff --git a/ndk/apps/hello-gl2/project/src/com/android/gl2jni/GL2JNIView.java b/ndk/apps/hello-gl2/project/src/com/android/gl2jni/GL2JNIView.java
deleted file mode 100644
index 060290a..0000000
--- a/ndk/apps/hello-gl2/project/src/com/android/gl2jni/GL2JNIView.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * 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.
- */
-
-package com.android.gl2jni;
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * 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.
- */
-
-
-import android.content.Context;
-import android.graphics.PixelFormat;
-import android.opengl.GLSurfaceView;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-
-import javax.microedition.khronos.egl.EGL10;
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.egl.EGLContext;
-import javax.microedition.khronos.egl.EGLDisplay;
-import javax.microedition.khronos.opengles.GL10;
-
-/**
- * A simple GLSurfaceView sub-class that demonstrate how to perform
- * OpenGL ES 2.0 rendering into a GL Surface. Note the following important
- * details:
- *
- * - The class must use a custom context factory to enable 2.0 rendering.
- *   See ContextFactory class definition below.
- *
- * - The class must use a custom EGLConfigChooser to be able to select
- *   an EGLConfig that supports 2.0. This is done by providing a config
- *   specification to eglChooseConfig() that has the attribute
- *   EGL10.ELG_RENDERABLE_TYPE containing the EGL_OPENGL_ES2_BIT flag
- *   set. See ConfigChooser class definition below.
- *
- * - The class must select the surface's format, then choose an EGLConfig
- *   that matches it exactly (with regards to red/green/blue/alpha channels
- *   bit depths). Failure to do so would result in an EGL_BAD_MATCH error.
- */
-class GL2JNIView extends GLSurfaceView {
-    private static String TAG = "GL2JNIView";
-    private static final boolean DEBUG = false;
-
-    public GL2JNIView(Context context) {
-        super(context);
-        init(false, 0, 0);
-    }
-
-    public GL2JNIView(Context context, boolean translucent, int depth, int stencil) {
-        super(context);
-        init(translucent, depth, stencil);
-    }
-
-    private void init(boolean translucent, int depth, int stencil) {
-
-        /* By default, GLSurfaceView() creates a RGB_565 opaque surface.
-         * If we want a translucent one, we should change the surface's
-         * format here, using PixelFormat.TRANSLUCENT for GL Surfaces
-         * is interpreted as any 32-bit surface with alpha by SurfaceFlinger.
-         */
-        if (translucent) {
-            this.getHolder().setFormat(PixelFormat.TRANSLUCENT);
-        }
-
-        /* Setup the context factory for 2.0 rendering.
-         * See ContextFactory class definition below
-         */
-        setEGLContextFactory(new ContextFactory());
-
-        /* We need to choose an EGLConfig that matches the format of
-         * our surface exactly. This is going to be done in our
-         * custom config chooser. See ConfigChooser class definition
-         * below.
-         */
-        setEGLConfigChooser( translucent ?
-                             new ConfigChooser(8, 8, 8, 8, depth, stencil) :
-                             new ConfigChooser(5, 6, 5, 0, depth, stencil) );
-
-        /* Set the renderer responsible for frame rendering */
-        setRenderer(new Renderer());
-    }
-
-    private static class ContextFactory implements GLSurfaceView.EGLContextFactory {
-        private static int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
-        public EGLContext createContext(EGL10 egl, EGLDisplay display, EGLConfig eglConfig) {
-            Log.w(TAG, "creating OpenGL ES 2.0 context");
-            checkEglError("Before eglCreateContext", egl);
-            int[] attrib_list = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL10.EGL_NONE };
-            EGLContext context = egl.eglCreateContext(display, eglConfig, EGL10.EGL_NO_CONTEXT, attrib_list);
-            checkEglError("After eglCreateContext", egl);
-            return context;
-        }
-
-        public void destroyContext(EGL10 egl, EGLDisplay display, EGLContext context) {
-            egl.eglDestroyContext(display, context);
-        }
-    }
-
-    private static void checkEglError(String prompt, EGL10 egl) {
-        int error;
-        while ((error = egl.eglGetError()) != EGL10.EGL_SUCCESS) {
-            Log.e(TAG, String.format("%s: EGL error: 0x%x", prompt, error));
-        }
-    }
-
-    private static class ConfigChooser implements GLSurfaceView.EGLConfigChooser {
-
-        public ConfigChooser(int r, int g, int b, int a, int depth, int stencil) {
-            mRedSize = r;
-            mGreenSize = g;
-            mBlueSize = b;
-            mAlphaSize = a;
-            mDepthSize = depth;
-            mStencilSize = stencil;
-        }
-
-        /* This EGL config specification is used to specify 2.0 rendering.
-         * We use a minimum size of 4 bits for red/green/blue, but will
-         * perform actual matching in chooseConfig() below.
-         */
-        private static int EGL_OPENGL_ES2_BIT = 4;
-        private static int[] s_configAttribs2 =
-        {
-            EGL10.EGL_RED_SIZE, 4,
-            EGL10.EGL_GREEN_SIZE, 4,
-            EGL10.EGL_BLUE_SIZE, 4,
-            EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-            EGL10.EGL_NONE
-        };
-
-        public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) {
-
-            /* Get the number of minimally matching EGL configurations
-             */
-            int[] num_config = new int[1];
-            egl.eglChooseConfig(display, s_configAttribs2, null, 0, num_config);
-
-            int numConfigs = num_config[0];
-
-            if (numConfigs <= 0) {
-                throw new IllegalArgumentException("No configs match configSpec");
-            }
-
-            /* Allocate then read the array of minimally matching EGL configs
-             */
-            EGLConfig[] configs = new EGLConfig[numConfigs];
-            egl.eglChooseConfig(display, s_configAttribs2, configs, numConfigs, num_config);
-
-            if (DEBUG) {
-                 printConfigs(egl, display, configs);
-            }
-            /* Now return the "best" one
-             */
-            return chooseConfig(egl, display, configs);
-        }
-
-        public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display,
-                EGLConfig[] configs) {
-            for(EGLConfig config : configs) {
-                int d = findConfigAttrib(egl, display, config,
-                        EGL10.EGL_DEPTH_SIZE, 0);
-                int s = findConfigAttrib(egl, display, config,
-                        EGL10.EGL_STENCIL_SIZE, 0);
-
-                // We need at least mDepthSize and mStencilSize bits
-                if (d < mDepthSize || s < mStencilSize)
-                    continue;
-
-                // We want an *exact* match for red/green/blue/alpha
-                int r = findConfigAttrib(egl, display, config,
-                        EGL10.EGL_RED_SIZE, 0);
-                int g = findConfigAttrib(egl, display, config,
-                            EGL10.EGL_GREEN_SIZE, 0);
-                int b = findConfigAttrib(egl, display, config,
-                            EGL10.EGL_BLUE_SIZE, 0);
-                int a = findConfigAttrib(egl, display, config,
-                        EGL10.EGL_ALPHA_SIZE, 0);
-
-                if (r == mRedSize && g == mGreenSize && b == mBlueSize && a == mAlphaSize)
-                    return config;
-            }
-            return null;
-        }
-
-        private int findConfigAttrib(EGL10 egl, EGLDisplay display,
-                EGLConfig config, int attribute, int defaultValue) {
-
-            if (egl.eglGetConfigAttrib(display, config, attribute, mValue)) {
-                return mValue[0];
-            }
-            return defaultValue;
-        }
-
-        private void printConfigs(EGL10 egl, EGLDisplay display,
-            EGLConfig[] configs) {
-            int numConfigs = configs.length;
-            Log.w(TAG, String.format("%d configurations", numConfigs));
-            for (int i = 0; i < numConfigs; i++) {
-                Log.w(TAG, String.format("Configuration %d:\n", i));
-                printConfig(egl, display, configs[i]);
-            }
-        }
-
-        private void printConfig(EGL10 egl, EGLDisplay display,
-                EGLConfig config) {
-            int[] attributes = {
-                    EGL10.EGL_BUFFER_SIZE,
-                    EGL10.EGL_ALPHA_SIZE,
-                    EGL10.EGL_BLUE_SIZE,
-                    EGL10.EGL_GREEN_SIZE,
-                    EGL10.EGL_RED_SIZE,
-                    EGL10.EGL_DEPTH_SIZE,
-                    EGL10.EGL_STENCIL_SIZE,
-                    EGL10.EGL_CONFIG_CAVEAT,
-                    EGL10.EGL_CONFIG_ID,
-                    EGL10.EGL_LEVEL,
-                    EGL10.EGL_MAX_PBUFFER_HEIGHT,
-                    EGL10.EGL_MAX_PBUFFER_PIXELS,
-                    EGL10.EGL_MAX_PBUFFER_WIDTH,
-                    EGL10.EGL_NATIVE_RENDERABLE,
-                    EGL10.EGL_NATIVE_VISUAL_ID,
-                    EGL10.EGL_NATIVE_VISUAL_TYPE,
-                    0x3030, // EGL10.EGL_PRESERVED_RESOURCES,
-                    EGL10.EGL_SAMPLES,
-                    EGL10.EGL_SAMPLE_BUFFERS,
-                    EGL10.EGL_SURFACE_TYPE,
-                    EGL10.EGL_TRANSPARENT_TYPE,
-                    EGL10.EGL_TRANSPARENT_RED_VALUE,
-                    EGL10.EGL_TRANSPARENT_GREEN_VALUE,
-                    EGL10.EGL_TRANSPARENT_BLUE_VALUE,
-                    0x3039, // EGL10.EGL_BIND_TO_TEXTURE_RGB,
-                    0x303A, // EGL10.EGL_BIND_TO_TEXTURE_RGBA,
-                    0x303B, // EGL10.EGL_MIN_SWAP_INTERVAL,
-                    0x303C, // EGL10.EGL_MAX_SWAP_INTERVAL,
-                    EGL10.EGL_LUMINANCE_SIZE,
-                    EGL10.EGL_ALPHA_MASK_SIZE,
-                    EGL10.EGL_COLOR_BUFFER_TYPE,
-                    EGL10.EGL_RENDERABLE_TYPE,
-                    0x3042 // EGL10.EGL_CONFORMANT
-            };
-            String[] names = {
-                    "EGL_BUFFER_SIZE",
-                    "EGL_ALPHA_SIZE",
-                    "EGL_BLUE_SIZE",
-                    "EGL_GREEN_SIZE",
-                    "EGL_RED_SIZE",
-                    "EGL_DEPTH_SIZE",
-                    "EGL_STENCIL_SIZE",
-                    "EGL_CONFIG_CAVEAT",
-                    "EGL_CONFIG_ID",
-                    "EGL_LEVEL",
-                    "EGL_MAX_PBUFFER_HEIGHT",
-                    "EGL_MAX_PBUFFER_PIXELS",
-                    "EGL_MAX_PBUFFER_WIDTH",
-                    "EGL_NATIVE_RENDERABLE",
-                    "EGL_NATIVE_VISUAL_ID",
-                    "EGL_NATIVE_VISUAL_TYPE",
-                    "EGL_PRESERVED_RESOURCES",
-                    "EGL_SAMPLES",
-                    "EGL_SAMPLE_BUFFERS",
-                    "EGL_SURFACE_TYPE",
-                    "EGL_TRANSPARENT_TYPE",
-                    "EGL_TRANSPARENT_RED_VALUE",
-                    "EGL_TRANSPARENT_GREEN_VALUE",
-                    "EGL_TRANSPARENT_BLUE_VALUE",
-                    "EGL_BIND_TO_TEXTURE_RGB",
-                    "EGL_BIND_TO_TEXTURE_RGBA",
-                    "EGL_MIN_SWAP_INTERVAL",
-                    "EGL_MAX_SWAP_INTERVAL",
-                    "EGL_LUMINANCE_SIZE",
-                    "EGL_ALPHA_MASK_SIZE",
-                    "EGL_COLOR_BUFFER_TYPE",
-                    "EGL_RENDERABLE_TYPE",
-                    "EGL_CONFORMANT"
-            };
-            int[] value = new int[1];
-            for (int i = 0; i < attributes.length; i++) {
-                int attribute = attributes[i];
-                String name = names[i];
-                if ( egl.eglGetConfigAttrib(display, config, attribute, value)) {
-                    Log.w(TAG, String.format("  %s: %d\n", name, value[0]));
-                } else {
-                    // Log.w(TAG, String.format("  %s: failed\n", name));
-                    while (egl.eglGetError() != EGL10.EGL_SUCCESS);
-                }
-            }
-        }
-
-        // Subclasses can adjust these values:
-        protected int mRedSize;
-        protected int mGreenSize;
-        protected int mBlueSize;
-        protected int mAlphaSize;
-        protected int mDepthSize;
-        protected int mStencilSize;
-        private int[] mValue = new int[1];
-    }
-
-    private static class Renderer implements GLSurfaceView.Renderer {
-        public void onDrawFrame(GL10 gl) {
-            GL2JNILib.step();
-        }
-
-        public void onSurfaceChanged(GL10 gl, int width, int height) {
-            GL2JNILib.init(width, height);
-        }
-
-        public void onSurfaceCreated(GL10 gl, EGLConfig config) {
-            // Do nothing.
-        }
-    }
-}
diff --git a/ndk/apps/hello-jni/Application.mk b/ndk/apps/hello-jni/Application.mk
deleted file mode 100644
index f5ac839..0000000
--- a/ndk/apps/hello-jni/Application.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-APP_PROJECT_PATH := $(call my-dir)/project
-APP_MODULES      := hello-jni
diff --git a/ndk/apps/hello-jni/project/AndroidManifest.xml b/ndk/apps/hello-jni/project/AndroidManifest.xml
deleted file mode 100644
index b6307c7..0000000
--- a/ndk/apps/hello-jni/project/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.example.hellojni"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="3" />
-    <application android:label="@string/app_name">
-        <activity android:name=".HelloJni"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest> 
diff --git a/ndk/apps/hello-jni/project/default.properties b/ndk/apps/hello-jni/project/default.properties
deleted file mode 100644
index 4513a1e..0000000
--- a/ndk/apps/hello-jni/project/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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 use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-3
diff --git a/ndk/apps/hello-jni/project/jni/Android.mk b/ndk/apps/hello-jni/project/jni/Android.mk
deleted file mode 100644
index 6ccf381..0000000
--- a/ndk/apps/hello-jni/project/jni/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := hello-jni
-LOCAL_SRC_FILES := hello-jni.c
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/ndk/apps/hello-jni/project/jni/hello-jni.c b/ndk/apps/hello-jni/project/jni/hello-jni.c
deleted file mode 100644
index 632ac17..0000000
--- a/ndk/apps/hello-jni/project/jni/hello-jni.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * 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 <string.h>
-#include <jni.h>
-
-/* This is a trivial JNI example where we use a native method
- * to return a new VM String. See the corresponding Java source
- * file located at:
- *
- *   apps/samples/hello-jni/project/src/com/example/HelloJni/HelloJni.java
- */
-jstring
-Java_com_example_hellojni_HelloJni_stringFromJNI( JNIEnv* env,
-                                                  jobject thiz )
-{
-    return (*env)->NewStringUTF(env, "Hello from JNI !");
-}
diff --git a/ndk/apps/hello-jni/project/res/values/strings.xml b/ndk/apps/hello-jni/project/res/values/strings.xml
deleted file mode 100644
index c526073..0000000
--- a/ndk/apps/hello-jni/project/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">HelloJni</string>
-</resources>
diff --git a/ndk/apps/hello-jni/project/src/com/example/hellojni/HelloJni.java b/ndk/apps/hello-jni/project/src/com/example/hellojni/HelloJni.java
deleted file mode 100644
index 97ab6d9..0000000
--- a/ndk/apps/hello-jni/project/src/com/example/hellojni/HelloJni.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * 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.
- */
-package com.example.hellojni;
-
-import android.app.Activity;
-import android.widget.TextView;
-import android.os.Bundle;
-
-
-public class HelloJni extends Activity
-{
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-
-        /* Create a TextView and set its content.
-         * the text is retrieved by calling a native
-         * function.
-         */
-        TextView  tv = new TextView(this);
-        tv.setText( stringFromJNI() );
-        setContentView(tv);
-    }
-
-    /* A native method that is implemented by the
-     * 'hello-jni' native library, which is packaged
-     * with this application.
-     */
-    public native String  stringFromJNI();
-
-    /* This is another native method declaration that is *not*
-     * implemented by 'hello-jni'. This is simply to show that
-     * you can declare as many native methods in your Java code
-     * as you want, their implementation is searched in the
-     * currently loaded native libraries only the first time
-     * you call them.
-     *
-     * Trying to call this function will result in a
-     * java.lang.UnsatisfiedLinkError exception !
-     */
-    public native String  unimplementedStringFromJNI();
-
-    /* this is used to load the 'hello-jni' library on application
-     * startup. The library has already been unpacked into
-     * /data/data/com.example.HelloJni/lib/libhello-jni.so at
-     * installation time by the package manager.
-     */
-    static {
-        System.loadLibrary("hello-jni");
-    }
-}
diff --git a/ndk/apps/hello-jni/project/tests/AndroidManifest.xml b/ndk/apps/hello-jni/project/tests/AndroidManifest.xml
deleted file mode 100644
index d6be01e..0000000
--- a/ndk/apps/hello-jni/project/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.example.HelloJni.tests"
-          android:versionCode="1"
-          android:versionName="1.0">
-    <!-- We add an application tag here just so that we can indicate that
-         this package needs to link against the android.test library,
-         which is needed when building test cases. -->
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-    <!--
-    This declares that this application uses the instrumentation test runner targeting
-    the package of com.example.HelloJni.  To run the tests use the command:
-    "adb shell am instrument -w com.example.HelloJni.tests/android.test.InstrumentationTestRunner"
-    -->
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.example.HelloJni"
-                     android:label="Tests for HelloJni"/>
-</manifest>
diff --git a/ndk/apps/hello-jni/project/tests/default.properties b/ndk/apps/hello-jni/project/tests/default.properties
deleted file mode 100644
index 4513a1e..0000000
--- a/ndk/apps/hello-jni/project/tests/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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 use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-3
diff --git a/ndk/apps/hello-jni/project/tests/src/com/example/HelloJni/HelloJniTest.java b/ndk/apps/hello-jni/project/tests/src/com/example/HelloJni/HelloJniTest.java
deleted file mode 100644
index 519d857..0000000
--- a/ndk/apps/hello-jni/project/tests/src/com/example/HelloJni/HelloJniTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.example.HelloJni;
-
-import android.test.ActivityInstrumentationTestCase;
-
-/**
- * This is a simple framework for a test of an Application.  See
- * {@link android.test.ApplicationTestCase ApplicationTestCase} for more information on
- * how to write and extend Application tests.
- * <p/>
- * To run this test, you can type:
- * adb shell am instrument -w \
- * -e class com.example.HelloJni.HelloJniTest \
- * com.example.HelloJni.tests/android.test.InstrumentationTestRunner
- */
-public class HelloJniTest extends ActivityInstrumentationTestCase<HelloJni> {
-
-    public HelloJniTest() {
-        super("com.example.HelloJni", HelloJni.class);
-    }
-
-}
diff --git a/ndk/apps/hello-neon/Application.mk b/ndk/apps/hello-neon/Application.mk
deleted file mode 100644
index 7325bb9..0000000
--- a/ndk/apps/hello-neon/Application.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-APP_PROJECT_PATH := $(call my-dir)/project
-APP_MODULES      := helloneon cpufeatures
-APP_ABI          := armeabi armeabi-v7a
diff --git a/ndk/apps/hello-neon/project/AndroidManifest.xml b/ndk/apps/hello-neon/project/AndroidManifest.xml
deleted file mode 100644
index 2d362d6..0000000
--- a/ndk/apps/hello-neon/project/AndroidManifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.example.neon"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <application android:label="@string/app_name">
-        <activity android:name=".HelloNeon"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest> 
diff --git a/ndk/apps/hello-neon/project/build.properties b/ndk/apps/hello-neon/project/build.properties
deleted file mode 100644
index 8167464..0000000
--- a/ndk/apps/hello-neon/project/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-# 
-# This file must be checked in 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.
-
-# 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.
-
-# The name of your application package as defined in the manifest.
-# Used by the 'uninstall' rule.
-application.package=com.example.neon
diff --git a/ndk/apps/hello-neon/project/default.properties b/ndk/apps/hello-neon/project/default.properties
deleted file mode 100644
index 4513a1e..0000000
--- a/ndk/apps/hello-neon/project/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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 use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-3
diff --git a/ndk/apps/hello-neon/project/jni/Android.mk b/ndk/apps/hello-neon/project/jni/Android.mk
deleted file mode 100644
index 5c7cb25..0000000
--- a/ndk/apps/hello-neon/project/jni/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := helloneon
-
-LOCAL_SRC_FILES := helloneon.c
-
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-    LOCAL_CFLAGS := -DHAVE_NEON=1
-    LOCAL_SRC_FILES += helloneon-intrinsics.c.neon
-endif
-
-LOCAL_C_INCLUDES := sources/cpufeatures
-
-LOCAL_STATIC_LIBRARIES := cpufeatures
-
-LOCAL_LDLIBS := -llog
-
-include $(BUILD_SHARED_LIBRARY)
-
-include sources/cpufeatures/Android.mk
diff --git a/ndk/apps/hello-neon/project/jni/helloneon-intrinsics.c b/ndk/apps/hello-neon/project/jni/helloneon-intrinsics.c
deleted file mode 100644
index 35367c1..0000000
--- a/ndk/apps/hello-neon/project/jni/helloneon-intrinsics.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * 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 "helloneon-intrinsics.h"
-#include <arm_neon.h>
-
-/* this source file should only be compiled by Android.mk when targeting
- * the armeabi-v7a ABI, and should be built in NEON mode
- */
-void
-fir_filter_neon_intrinsics(short *output, const short* input, const short* kernel, int width, int kernelSize)
-{
-#if 1
-   int nn, offset = -kernelSize/2;
-
-   for (nn = 0; nn < width; nn++)
-   {
-        int mm, sum = 0;
-        int32x4_t sum_vec = vdupq_n_s32(0);
-        for(mm = 0; mm < kernelSize/4; mm++)
-        {
-            int16x4_t  kernel_vec = vld1_s16(kernel + mm*4);
-            int16x4_t  input_vec = vld1_s16(input + (nn+offset+mm*4));
-            sum_vec = vmlal_s16(sum_vec, kernel_vec, input_vec);
-        }
-
-        sum += vgetq_lane_s32(sum_vec, 0);
-        sum += vgetq_lane_s32(sum_vec, 1);
-        sum += vgetq_lane_s32(sum_vec, 2);
-        sum += vgetq_lane_s32(sum_vec, 3);
-
-        if(kernelSize & 3)
-        {
-            for(mm = kernelSize - (kernelSize & 3); mm < kernelSize; mm++)
-                sum += kernel[mm] * input[nn+offset+mm];
-        }
-
-        output[nn] = (short)((sum + 0x8000) >> 16);
-    }
-#else /* for comparison purposes only */
-    int nn, offset = -kernelSize/2;
-    for (nn = 0; nn < width; nn++) {
-        int sum = 0;
-        int mm;
-        for (mm = 0; mm < kernelSize; mm++) {
-            sum += kernel[mm]*input[nn+offset+mm];
-        }
-        output[n] = (short)((sum + 0x8000) >> 16);
-    }
-#endif
-}
diff --git a/ndk/apps/hello-neon/project/jni/helloneon-intrinsics.h b/ndk/apps/hello-neon/project/jni/helloneon-intrinsics.h
deleted file mode 100644
index ad4c8db..0000000
--- a/ndk/apps/hello-neon/project/jni/helloneon-intrinsics.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * 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 HELLONEON_INTRINSICS_H
-#define HELLONEON_INTRINSICS_H
-
-void fir_filter_neon_intrinsics(short *output, const short* input, const short* kernel, int width, int kernelSize);
-
-#endif /* HELLONEON_INTRINSICS_H */
diff --git a/ndk/apps/hello-neon/project/jni/helloneon.c b/ndk/apps/hello-neon/project/jni/helloneon.c
deleted file mode 100644
index ee19e08..0000000
--- a/ndk/apps/hello-neon/project/jni/helloneon.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * 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 <jni.h>
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <cpu-features.h>
-#include "helloneon-intrinsics.h"
-
-#define DEBUG 0
-
-#if DEBUG
-#include <android/log.h>
-#  define  D(x...)  __android_log_print(ANDROID_LOG_INFO,"helloneon",x)
-#else
-#  define  D(...)  do {} while (0)
-#endif
-
-/* return current time in milliseconds */
-static double
-now_ms(void)
-{
-    struct timespec res;
-    clock_gettime(CLOCK_REALTIME, &res);
-    return 1000.0*res.tv_sec + (double)res.tv_nsec/1e6;
-}
-
-
-/* this is a FIR filter implemented in C */
-static void
-fir_filter_c(short *output, const short* input, const short* kernel, int width, int kernelSize)
-{
-    int  offset = -kernelSize/2;
-    int  nn;
-    for (nn = 0; nn < width; nn++) {
-        int sum = 0;
-        int mm;
-        for (mm = 0; mm < kernelSize; mm++) {
-            sum += kernel[mm]*input[nn+offset+mm];
-        }
-        output[nn] = (short)((sum + 0x8000) >> 16);
-    }
-}
-
-#define  FIR_KERNEL_SIZE   32
-#define  FIR_OUTPUT_SIZE   2560
-#define  FIR_INPUT_SIZE    (FIR_OUTPUT_SIZE + FIR_KERNEL_SIZE)
-#define  FIR_ITERATIONS    600
-
-static const short  fir_kernel[FIR_KERNEL_SIZE] = { 
-    0x10, 0x20, 0x40, 0x70, 0x8c, 0xa2, 0xce, 0xf0, 0xe9, 0xce, 0xa2, 0x8c, 070, 0x40, 0x20, 0x10,
-    0x10, 0x20, 0x40, 0x70, 0x8c, 0xa2, 0xce, 0xf0, 0xe9, 0xce, 0xa2, 0x8c, 070, 0x40, 0x20, 0x10 };
-
-static short        fir_output[FIR_OUTPUT_SIZE];
-static short        fir_input_0[FIR_INPUT_SIZE];
-static const short* fir_input = fir_input_0 + (FIR_KERNEL_SIZE/2);
-static short        fir_output_expected[FIR_OUTPUT_SIZE];
-
-/* This is a trivial JNI example where we use a native method
- * to return a new VM String. See the corresponding Java source
- * file located at:
- *
- *   apps/samples/hello-neon/project/src/com/example/neon/HelloNeon.java
- */
-jstring
-Java_com_example_neon_HelloNeon_stringFromJNI( JNIEnv* env,
-                                               jobject thiz )
-{
-    char*  str;
-    uint64_t features;
-    char buffer[512];
-    char tryNeon = 0;
-    double  t0, t1, time_c, time_neon;
-
-    /* setup FIR input - whatever */
-    {
-        int  nn;
-        for (nn = 0; nn < FIR_INPUT_SIZE; nn++) {
-            fir_input_0[nn] = (5*nn) & 255;
-        }
-        fir_filter_c(fir_output_expected, fir_input, fir_kernel, FIR_OUTPUT_SIZE, FIR_KERNEL_SIZE);
-    }
-
-    /* Benchmark small FIR filter loop - C version */
-    t0 = now_ms();
-    {
-        int  count = FIR_ITERATIONS;
-        for (; count > 0; count--) {
-            fir_filter_c(fir_output, fir_input, fir_kernel, FIR_OUTPUT_SIZE, FIR_KERNEL_SIZE);
-        }
-    }
-    t1 = now_ms();
-    time_c = t1 - t0;
-
-    asprintf(&str, "FIR Filter benchmark:\nC version          : %g ms\n", time_c);
-    strlcpy(buffer, str, sizeof buffer);
-    free(str);
-
-    strlcat(buffer, "Neon version   : ", sizeof buffer);
-
-    if (android_getCpuFamily() != ANDROID_CPU_FAMILY_ARM) {
-        strlcat(buffer, "Not an ARM CPU !\n", sizeof buffer);
-        goto EXIT;
-    }
-
-    features = android_getCpuFeatures();
-    if ((features & ANDROID_CPU_ARM_FEATURE_ARMv7) == 0) {
-        strlcat(buffer, "Not an ARMv7 CPU !\n", sizeof buffer);
-        goto EXIT;
-    }
-
-    /* HAVE_NEON is defined in Android.mk ! */
-#ifdef HAVE_NEON
-    if ((features & ANDROID_CPU_ARM_FEATURE_NEON) == 0) {
-        strlcat(buffer, "CPU doesn't support NEON !\n", sizeof buffer);
-        goto EXIT;
-    }
-
-    /* Benchmark small FIR filter loop - Neon version */
-    t0 = now_ms();
-    {
-        int  count = FIR_ITERATIONS;
-        for (; count > 0; count--) {
-            fir_filter_neon_intrinsics(fir_output, fir_input, fir_kernel, FIR_OUTPUT_SIZE, FIR_KERNEL_SIZE);
-        }
-    }
-    t1 = now_ms();
-    time_neon = t1 - t0;
-    asprintf(&str, "%g ms (x%g faster)\n", time_neon, time_c / (time_neon < 1e-6 ? 1. : time_neon));
-    strlcat(buffer, str, sizeof buffer);
-    free(str);
-
-    /* check the result, just in case */
-    {
-        int  nn, fails = 0;
-        for (nn = 0; nn < FIR_OUTPUT_SIZE; nn++) {
-            if (fir_output[nn] != fir_output_expected[nn]) {
-                if (++fails < 16)
-                    D("neon[%d] = %d expected %d", nn, fir_output[nn], fir_output_expected[nn]);
-            }
-        }
-        D("%d fails\n", fails);
-    }
-#else /* !HAVE_NEON */
-    strlcat(buffer, "Program not compiled with ARMv7 support !\n", sizeof buffer);
-#endif /* !HAVE_NEON */
-EXIT:
-    return (*env)->NewStringUTF(env, buffer);
-}
diff --git a/ndk/apps/hello-neon/project/res/values/strings.xml b/ndk/apps/hello-neon/project/res/values/strings.xml
deleted file mode 100644
index 8d8f980..0000000
--- a/ndk/apps/hello-neon/project/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">HelloNeon</string>
-</resources>
diff --git a/ndk/apps/hello-neon/project/src/com/example/neon/HelloNeon.java b/ndk/apps/hello-neon/project/src/com/example/neon/HelloNeon.java
deleted file mode 100644
index b2f5e88..0000000
--- a/ndk/apps/hello-neon/project/src/com/example/neon/HelloNeon.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.example.neon;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-
-public class HelloNeon extends Activity
-{
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        /* Create a TextView and set its content.
-         * the text is retrieved by calling a native
-         * function.
-         */
-        TextView  tv = new TextView(this);
-        tv.setText( stringFromJNI() );
-        setContentView(tv);
-    }
-
-    /* A native method that is implemented by the
-     * 'helloneon' native library, which is packaged
-     * with this application.
-     */
-    public native String  stringFromJNI();
-
-    /* this is used to load the 'helloneon' library on application
-     * startup. The library has already been unpacked into
-     * /data/data/com.example.neon/lib/libhelloneon.so at
-     * installation time by the package manager.
-     */
-    static {
-        System.loadLibrary("helloneon");
-    }
-}
diff --git a/ndk/apps/san-angeles/Application.mk b/ndk/apps/san-angeles/Application.mk
deleted file mode 100644
index 3ba4361..0000000
--- a/ndk/apps/san-angeles/Application.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-APP_MODULES      := sanangeles
-APP_PROJECT_PATH := $(call my-dir)/project
diff --git a/ndk/apps/san-angeles/project/AndroidManifest.xml b/ndk/apps/san-angeles/project/AndroidManifest.xml
deleted file mode 100644
index 5ae6a8e..0000000
--- a/ndk/apps/san-angeles/project/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.example.SanAngeles"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <application android:label="@string/app_name">
-        <activity android:name=".DemoActivity"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    <uses-sdk android:minSdkVersion="4" />
-</manifest> 
diff --git a/ndk/apps/san-angeles/project/default.properties b/ndk/apps/san-angeles/project/default.properties
deleted file mode 100644
index 9d79b12..0000000
--- a/ndk/apps/san-angeles/project/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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 use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-4
diff --git a/ndk/apps/san-angeles/project/jni/Android.mk b/ndk/apps/san-angeles/project/jni/Android.mk
deleted file mode 100644
index 5663edf..0000000
--- a/ndk/apps/san-angeles/project/jni/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := sanangeles
-
-LOCAL_CFLAGS := -DANDROID_NDK \
-                -DDISABLE_IMPORTGL
-
-LOCAL_SRC_FILES := \
-    importgl.c \
-    demo.c \
-    app-android.c \
-
-LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/ndk/apps/san-angeles/project/jni/README.txt b/ndk/apps/san-angeles/project/jni/README.txt
deleted file mode 100644
index 38b8a4a..0000000
--- a/ndk/apps/san-angeles/project/jni/README.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-------------------------------------------------------------------------

-San Angeles Observation OpenGL ES version example

-Copyright 2004-2005 Jetro Lauha

-Web: http://iki.fi/jetro/

-See file license.txt for licensing information.

-------------------------------------------------------------------------

-

-This is an OpenGL ES port of the small self-running demonstration

-called "San Angeles Observation", which was first presented in the

-Assembly'2004 event. It won the first place in the 4 KB intro

-competition category.

-

-The demonstration features a sightseeing of a futuristic city

-having many different kind of buildings and items. Everything is

-flat shaded with three different lights.

-

-The original version was made for desktop with OpenGL. It was

-naturally heavily size optimized in order to fit it in the size

-limit. For this OpenGL ES version example much of the code is

-cleaned up and the sound is removed. Also detail level is lowered,

-although it still contains over 60000 faces.

-

-The Win32 (2000/XP) binary package of original version is

-available from this address: http://jet.ro/files/angeles.zip

-

-First version of this OpenGL ES port was submitted to the Khronos

-OpenGL ES Coding Challenge held in 2004-2005.

-

-As a code example, this source shows the following:

-  * How to create a minimal and portable ad hoc framework

-    for small testing/demonstration programs. This framework

-    compiles for both desktop and PocketPC Win32 environment,

-    and a separate source is included for Linux with X11.

-  * How to dynamically find and use the OpenGL ES DLL or

-    shared object, so that the library is not needed at

-    the compile/link stage.

-  * How to use the basic features of OpenGL ES 1.0/1.1

-    Common Lite, such as vertex arrays, color arrays and

-    lighting.

-  * How to create a self contained small demonstration

-    application with objects generated using procedural

-    algorithms.

-

-As the original version was optimized for size instead of

-performance, that holds true for this OpenGL ES version as

-well. Thus the performance could be significantly increased,

-for example by changing the code to use glDrawElements

-instead of glDrawArrays. The code uses only OpenGL ES 1.0

-Common Lite -level function calls without any extensions.

-

-The reference OpenGL ES implementations used for this application:

-  * Hybrid's OpenGL ES API Implementation (Gerbera) version 2.0.4

-    Prebuilt Win32 PC executable: SanOGLES-Gerbera.exe

-  * PowerVR MBX SDK, OpenGL ES Windows PC Emulation version 1.04.14.0170

-    Prebuilt Win32 PC executable: SanOGLES-PVRSDK.exe

-

-Note that DISABLE_IMPORTGL preprocessor macro can be used

-to specify not to use dynamic runtime binding of the library.

-You also need to define preprocessor macro PVRSDK to compile

-the source with PowerVR OpenGL ES SDK.

-

-The demo application is briefly tested with a few other OpenGL ES

-implementations as well (e.g. Vincent, GLESonGL on Linux, Dell

-Axim X50v). Most of these other implementations rendered the demo

-erroneously in some aspect. This may indicate that the demo source

-could still have some work to do with compatibility and correct

-API usage, although the non-conforming implementations are most

-probably unfinished as well.

-

-Thanks and Acknowledgements:

-

-* Toni Lönnberg (!Cube) created the music for original version, which

-  is not featured in this OpenGL ES port.

-* Sara Kapli (st Rana) for additional camera work.

-* Paul Bourke for information about the supershapes.

-

-------------------------------------------------------------------------

diff --git a/ndk/apps/san-angeles/project/jni/app-android.c b/ndk/apps/san-angeles/project/jni/app-android.c
deleted file mode 100644
index 0e552a7..0000000
--- a/ndk/apps/san-angeles/project/jni/app-android.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* San Angeles Observation OpenGL ES version example
- * Copyright 2009 The Android Open Source Project
- * All rights reserved.
- *
- * This source is free software; you can redistribute it and/or
- * modify it under the terms of EITHER:
- *   (1) The GNU Lesser General Public License as published by the Free
- *       Software Foundation; either version 2.1 of the License, or (at
- *       your option) any later version. The text of the GNU Lesser
- *       General Public License is included with this source in the
- *       file LICENSE-LGPL.txt.
- *   (2) The BSD-style license that is included with this source in
- *       the file LICENSE-BSD.txt.
- *
- * This source is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
- * LICENSE-LGPL.txt and LICENSE-BSD.txt for more details.
- */
-#include <jni.h>
-#include <sys/time.h>
-#include <time.h>
-#include <android/log.h>
-#include <stdint.h>
-
-int   gAppAlive   = 1;
-
-static int  sWindowWidth  = 320;
-static int  sWindowHeight = 480;
-static int  sDemoStopped  = 0;
-static long sTimeOffset   = 0;
-static int  sTimeOffsetInit = 0;
-static long sTimeStopped  = 0;
-
-static long
-_getTime(void)
-{
-    struct timeval  now;
-
-    gettimeofday(&now, NULL);
-    return (long)(now.tv_sec*1000 + now.tv_usec/1000);
-}
-
-/* Call to initialize the graphics state */
-void
-Java_com_example_SanAngeles_DemoRenderer_nativeInit( JNIEnv*  env )
-{
-    importGLInit();
-    appInit();
-    gAppAlive    = 1;
-    sDemoStopped = 0;
-    sTimeOffsetInit = 0;
-}
-
-void
-Java_com_example_SanAngeles_DemoRenderer_nativeResize( JNIEnv*  env, jobject  thiz, jint w, jint h )
-{
-    sWindowWidth  = w;
-    sWindowHeight = h;
-    __android_log_print(ANDROID_LOG_INFO, "SanAngeles", "resize w=%d h=%d", w, h);
-}
-
-/* Call to finalize the graphics state */
-void
-Java_com_example_SanAngeles_DemoRenderer_nativeDone( JNIEnv*  env )
-{
-    appDeinit();
-    importGLDeinit();
-}
-
-/* This is called to indicate to the render loop that it should
- * stop as soon as possible.
- */
-void
-Java_com_example_SanAngeles_DemoGLSurfaceView_nativePause( JNIEnv*  env )
-{
-    sDemoStopped = !sDemoStopped;
-    if (sDemoStopped) {
-        /* we paused the animation, so store the current
-         * time in sTimeStopped for future nativeRender calls */
-        sTimeStopped = _getTime();
-    } else {
-        /* we resumed the animation, so adjust the time offset
-         * to take care of the pause interval. */
-        sTimeOffset -= _getTime() - sTimeStopped;
-    }
-}
-
-/* Call to render the next GL frame */
-void
-Java_com_example_SanAngeles_DemoRenderer_nativeRender( JNIEnv*  env )
-{
-    long   curTime;
-
-    /* NOTE: if sDemoStopped is TRUE, then we re-render the same frame
-     *       on each iteration.
-     */
-    if (sDemoStopped) {
-        curTime = sTimeStopped + sTimeOffset;
-    } else {
-        curTime = _getTime() + sTimeOffset;
-        if (sTimeOffsetInit == 0) {
-            sTimeOffsetInit = 1;
-            sTimeOffset     = -curTime;
-            curTime         = 0;
-        }
-    }
-
-    //__android_log_print(ANDROID_LOG_INFO, "SanAngeles", "curTime=%ld", curTime);
-
-    appRender(curTime, sWindowWidth, sWindowHeight);
-}
diff --git a/ndk/apps/san-angeles/project/jni/app-linux.c b/ndk/apps/san-angeles/project/jni/app-linux.c
deleted file mode 100644
index 6b573f2..0000000
--- a/ndk/apps/san-angeles/project/jni/app-linux.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/* San Angeles Observation OpenGL ES version example
- * Copyright 2004-2005 Jetro Lauha
- * All rights reserved.
- * Web: http://iki.fi/jetro/
- *
- * This source is free software; you can redistribute it and/or
- * modify it under the terms of EITHER:
- *   (1) The GNU Lesser General Public License as published by the Free
- *       Software Foundation; either version 2.1 of the License, or (at
- *       your option) any later version. The text of the GNU Lesser
- *       General Public License is included with this source in the
- *       file LICENSE-LGPL.txt.
- *   (2) The BSD-style license that is included with this source in
- *       the file LICENSE-BSD.txt.
- *
- * This source is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
- * LICENSE-LGPL.txt and LICENSE-BSD.txt for more details.
- *
- * $Id: app-linux.c,v 1.4 2005/02/08 18:42:48 tonic Exp $
- * $Revision: 1.4 $
- *
- * Parts of this source file is based on test/example code from
- * GLESonGL implementation by David Blythe. Here is copy of the
- * license notice from that source:
- *
- * Copyright (C) 2003  David Blythe   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * DAVID BLYTHE BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/keysym.h>
-
-#include "importgl.h"
-
-#include "app.h"
-
-
-int gAppAlive = 1;
-
-static const char sAppName[] =
-    "San Angeles Observation OpenGL ES version example (Linux)";
-static Display *sDisplay;
-static Window sWindow;
-static int sWindowWidth = WINDOW_DEFAULT_WIDTH;
-static int sWindowHeight = WINDOW_DEFAULT_HEIGHT;
-static EGLDisplay sEglDisplay = EGL_NO_DISPLAY;
-static EGLConfig sEglConfig;
-static EGLContext sEglContext = EGL_NO_CONTEXT;
-static EGLSurface sEglSurface = EGL_NO_SURFACE;
-
-
-static void checkGLErrors()
-{
-    GLenum error = glGetError();
-    if (error != GL_NO_ERROR)
-        fprintf(stderr, "GL Error: 0x%04x\n", (int)error);
-}
-
-
-static void checkEGLErrors()
-{
-    EGLint error = eglGetError();
-    // GLESonGL seems to be returning 0 when there is no errors?
-    if (error && error != EGL_SUCCESS)
-        fprintf(stderr, "EGL Error: 0x%04x\n", (int)error);
-}
-
-
-// Initializes and opens both X11 display and OpenGL ES.
-static int initGraphics()
-{
-    static const EGLint configAttribs[] =
-    {
-#if (WINDOW_BPP == 16)
-        EGL_RED_SIZE,       5,
-        EGL_GREEN_SIZE,     5,
-        EGL_BLUE_SIZE,      5,
-#elif (WINDOW_BPP == 32)
-        EGL_RED_SIZE,       8,
-        EGL_GREEN_SIZE,     8,
-        EGL_BLUE_SIZE,      8,
-#else
-#error WINDOW_BPP must be 16 or 32
-#endif
-        EGL_DEPTH_SIZE,     16,
-        EGL_ALPHA_SIZE,     EGL_DONT_CARE,
-        EGL_STENCIL_SIZE,   EGL_DONT_CARE,
-        EGL_SURFACE_TYPE,   EGL_WINDOW_BIT,
-        EGL_NONE
-    };
-    EGLBoolean success;
-    EGLint numConfigs;
-    EGLint majorVersion;
-    EGLint minorVersion;
-
-    int importGLResult;
-    importGLResult = importGLInit();
-    if (!importGLResult)
-        return 0;
-
-    sDisplay = XOpenDisplay(NULL);
-
-    sEglDisplay = eglGetDisplay(sDisplay);
-    success = eglInitialize(sEglDisplay, &majorVersion, &minorVersion);
-    if (success != EGL_FALSE)
-        success = eglGetConfigs(sEglDisplay, NULL, 0, &numConfigs);
-    if (success != EGL_FALSE)
-        success = eglChooseConfig(sEglDisplay, configAttribs,
-                                  &sEglConfig, 1, &numConfigs);
-    if (success != EGL_FALSE)
-    {
-        sEglContext = eglCreateContext(sEglDisplay, sEglConfig, NULL, NULL);
-        if (sEglContext == EGL_NO_CONTEXT)
-            success = EGL_FALSE;
-    }
-    if (success != EGL_FALSE)
-    {
-        XSetWindowAttributes swa;
-        XVisualInfo *vi, tmp;
-        XSizeHints sh;
-        int n;
-        EGLint vid;
-
-        eglGetConfigAttrib(sEglDisplay, sEglConfig,
-                           EGL_NATIVE_VISUAL_ID, &vid);
-        tmp.visualid = vid;
-        vi = XGetVisualInfo(sDisplay, VisualIDMask, &tmp, &n);
-        swa.colormap = XCreateColormap(sDisplay,
-                                       RootWindow(sDisplay, vi->screen),
-                                       vi->visual, AllocNone);
-        sh.flags = PMinSize | PMaxSize;
-        sh.min_width = sh.max_width = sWindowWidth;
-        sh.min_height = sh.max_height = sWindowHeight;
-        swa.border_pixel = 0;
-        swa.event_mask = ExposureMask | StructureNotifyMask |
-                         KeyPressMask | ButtonPressMask | ButtonReleaseMask;
-        sWindow = XCreateWindow(sDisplay, RootWindow(sDisplay, vi->screen),
-                                0, 0, sWindowWidth, sWindowHeight,
-                                0, vi->depth, InputOutput, vi->visual,
-                                CWBorderPixel | CWColormap | CWEventMask,
-                                &swa);
-        XMapWindow(sDisplay, sWindow);
-        XSetStandardProperties(sDisplay, sWindow, sAppName, sAppName,
-                               None, (void *)0, 0, &sh);
-    }
-    if (success != EGL_FALSE)
-    {
-        sEglSurface = eglCreateWindowSurface(sEglDisplay, sEglConfig,
-                                             (NativeWindowType)sWindow, NULL);
-        if (sEglSurface == EGL_NO_SURFACE)
-            success = EGL_FALSE;
-    }
-    if (success != EGL_FALSE)
-        success = eglMakeCurrent(sEglDisplay, sEglSurface,
-                                 sEglSurface, sEglContext);
-
-    if (success == EGL_FALSE)
-        checkEGLErrors();
-
-    return success != EGL_FALSE;
-}
-
-
-static void deinitGraphics()
-{
-    eglMakeCurrent(sEglDisplay, NULL, NULL, NULL);
-    eglDestroyContext(sEglDisplay, sEglContext);
-    eglDestroySurface(sEglDisplay, sEglSurface);
-    eglTerminate(sEglDisplay);
-    importGLDeinit();
-}
-
-
-int main(int argc, char *argv[])
-{
-    // not referenced:
-    argc = argc;
-    argv = argv;
-
-    if (!initGraphics())
-    {
-        fprintf(stderr, "Graphics initialization failed.\n");
-        return EXIT_FAILURE;
-    }
-
-    appInit();
-
-    while (gAppAlive)
-    {
-        struct timeval timeNow;
-
-        while (XPending(sDisplay))
-        {
-            XEvent ev;
-            XNextEvent(sDisplay, &ev);
-            switch (ev.type)
-            {
-            case KeyPress:
-                {
-                    unsigned int keycode, keysym;
-                    keycode = ((XKeyEvent *)&ev)->keycode;
-                    keysym = XKeycodeToKeysym(sDisplay, keycode, 0);
-                    if (keysym == XK_Return || keysym == XK_Escape)
-                        gAppAlive = 0;
-                }
-                break;
-            }
-        }
-
-        if (gAppAlive)
-        {
-            gettimeofday(&timeNow, NULL);
-            appRender(timeNow.tv_sec * 1000 + timeNow.tv_usec / 1000,
-                      sWindowWidth, sWindowHeight);
-            checkGLErrors();
-            eglSwapBuffers(sEglDisplay, sEglSurface);
-            checkEGLErrors();
-        }
-    }
-
-    appDeinit();
-    deinitGraphics();
-
-    return EXIT_SUCCESS;
-}
diff --git a/ndk/apps/san-angeles/project/jni/app-win32.c b/ndk/apps/san-angeles/project/jni/app-win32.c
deleted file mode 100644
index b47577e..0000000
--- a/ndk/apps/san-angeles/project/jni/app-win32.c
+++ /dev/null
@@ -1,294 +0,0 @@
-/* San Angeles Observation OpenGL ES version example
- * Copyright 2004-2005 Jetro Lauha
- * All rights reserved.
- * Web: http://iki.fi/jetro/
- *
- * This source is free software; you can redistribute it and/or
- * modify it under the terms of EITHER:
- *   (1) The GNU Lesser General Public License as published by the Free
- *       Software Foundation; either version 2.1 of the License, or (at
- *       your option) any later version. The text of the GNU Lesser
- *       General Public License is included with this source in the
- *       file LICENSE-LGPL.txt.
- *   (2) The BSD-style license that is included with this source in
- *       the file LICENSE-BSD.txt.
- *
- * This source is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
- * LICENSE-LGPL.txt and LICENSE-BSD.txt for more details.
- *
- * $Id: app-win32.c,v 1.6 2005/02/24 20:29:00 tonic Exp $
- * $Revision: 1.6 $
- */
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <tchar.h>
-#ifdef UNDER_CE
-#include <aygshell.h>
-#endif
-
-#include <stdio.h>
-
-#include "importgl.h"
-
-#include "app.h"
-
-
-int gAppAlive = 1;
-
-static HINSTANCE sInstance;
-
-static const _TCHAR sAppName[] =
-    _T("San Angeles Observation OpenGL ES version example (Win32)");
-static HWND sWnd;
-static int sWindowWidth = WINDOW_DEFAULT_WIDTH;
-static int sWindowHeight = WINDOW_DEFAULT_HEIGHT;
-static EGLDisplay sEglDisplay = EGL_NO_DISPLAY;
-static EGLConfig sEglConfig;
-static EGLContext sEglContext = EGL_NO_CONTEXT;
-static EGLSurface sEglSurface = EGL_NO_SURFACE;
-
-
-static void checkGLErrors()
-{
-    GLenum error = glGetError();
-    if (error != GL_NO_ERROR)
-    {
-        _TCHAR errorString[32];
-        _stprintf(errorString, _T("0x%04x"), error);
-        MessageBox(NULL, errorString, _T("GL Error"), MB_OK);
-    }
-}
-
-
-static void checkEGLErrors()
-{
-    EGLint error = eglGetError();
-    if (error != EGL_SUCCESS)
-    {
-        _TCHAR errorString[32];
-        _stprintf(errorString, _T("0x%04x"), error);
-        MessageBox(NULL, errorString, _T("EGL Initialization Error"), MB_OK);
-    }
-}
-
-
-static BOOL initEGL(HWND wnd)
-{
-    static const EGLint configAttribs[] =
-    {
-#if (WINDOW_BPP == 16)
-        EGL_RED_SIZE,       5,
-        EGL_GREEN_SIZE,     5,
-        EGL_BLUE_SIZE,      5,
-#elif (WINDOW_BPP == 32)
-        EGL_RED_SIZE,       8,
-        EGL_GREEN_SIZE,     8,
-        EGL_BLUE_SIZE,      8,
-#else
-#error WINDOW_BPP must be 16 or 32
-#endif
-        EGL_DEPTH_SIZE,     16,
-        EGL_ALPHA_SIZE,     EGL_DONT_CARE,
-        EGL_STENCIL_SIZE,   EGL_DONT_CARE,
-        EGL_SURFACE_TYPE,   EGL_WINDOW_BIT,
-        EGL_NONE
-    };
-    EGLBoolean success;
-    EGLint numConfigs;
-    EGLint majorVersion;
-    EGLint minorVersion;
-#ifdef PVRSDK
-    HDC dc;
-#endif // PVRSDK
-
-#ifndef DISABLE_IMPORTGL
-    int importGLResult;
-    importGLResult = importGLInit();
-    if (!importGLResult)
-        return FALSE;
-#endif // !DISABLE_IMPORTGL
-
-#ifdef PVRSDK
-    dc = GetDC(sWnd);
-    sEglDisplay = eglGetDisplay(dc);
-#else
-    sEglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-#endif // !PVRSDK
-    success = eglInitialize(sEglDisplay, &majorVersion, &minorVersion);
-    if (success != EGL_FALSE)
-        success = eglGetConfigs(sEglDisplay, NULL, 0, &numConfigs);
-    if (success != EGL_FALSE)
-        success = eglChooseConfig(sEglDisplay, configAttribs,
-                                  &sEglConfig, 1, &numConfigs);
-    if (success != EGL_FALSE)
-    {
-        sEglSurface = eglCreateWindowSurface(sEglDisplay, sEglConfig,
-                                             wnd, NULL);
-        if (sEglSurface == EGL_NO_SURFACE)
-            success = EGL_FALSE;
-    }
-    if (success != EGL_FALSE)
-    {
-        sEglContext = eglCreateContext(sEglDisplay, sEglConfig, NULL, NULL);
-        if (sEglContext == EGL_NO_CONTEXT)
-            success = EGL_FALSE;
-    }
-    if (success != EGL_FALSE)
-        success = eglMakeCurrent(sEglDisplay, sEglSurface,
-                                 sEglSurface, sEglContext);
-
-    if (success == EGL_FALSE)
-        checkEGLErrors();
-
-    return success;
-}
-
-
-static void deinitEGL()
-{
-    eglMakeCurrent(sEglDisplay, NULL, NULL, NULL);
-    eglDestroyContext(sEglDisplay, sEglContext);
-    eglDestroySurface(sEglDisplay, sEglSurface);
-    eglTerminate(sEglDisplay);
-#ifndef DISABLE_IMPORTGL
-    importGLDeinit();
-#endif // !DISABLE_IMPORTGL
-}
-
-
-static LRESULT CALLBACK wndProc(HWND wnd, UINT message,
-                                WPARAM wParam, LPARAM lParam)
-{
-    RECT rc;
-    int useDefWindowProc = 0;
-
-    switch (message)
-    {
-    case WM_CLOSE:
-        DestroyWindow(wnd);
-        gAppAlive = 0;
-        break;
-
-    case WM_DESTROY:
-        PostQuitMessage(0);
-        gAppAlive = 0;
-        break;
-
-    case WM_KEYDOWN:
-        if (wParam == VK_ESCAPE || wParam == VK_RETURN)
-            gAppAlive = 0;
-        useDefWindowProc = 1;
-        break;
-
-    case WM_KEYUP:
-        useDefWindowProc = 1;
-        break;
-
-    case WM_SIZE:
-        GetClientRect(sWnd, &rc);
-        sWindowWidth = rc.right;
-        sWindowHeight = rc.bottom;
-        break;
-
-    default:
-        useDefWindowProc = 1;
-    }
-
-    if (useDefWindowProc)
-        return DefWindowProc(wnd, message, wParam, lParam);
-    return 0;
-}
-
-
-int WINAPI WinMain(HINSTANCE instance, HINSTANCE prevInstance,
-                   LPTSTR cmdLine, int cmdShow)
-{
-    MSG msg;
-    WNDCLASS wc;
-    DWORD windowStyle;
-    int windowX, windowY;
-
-    // not referenced:
-    prevInstance = prevInstance;
-    cmdLine = cmdLine;
-
-
-    sInstance = instance;
-
-    // register class
-    wc.style = CS_HREDRAW | CS_VREDRAW;
-    wc.lpfnWndProc = (WNDPROC)wndProc;
-    wc.cbClsExtra = 0;
-    wc.cbWndExtra = 0;
-    wc.hInstance = sInstance;
-    wc.hIcon = NULL;
-    wc.hCursor = 0;
-    wc.hbrBackground = GetStockObject(BLACK_BRUSH);
-    wc.lpszMenuName = NULL;
-    wc.lpszClassName = sAppName;
-    if (!RegisterClass(&wc))
-        return FALSE;
-
-    // init instance
-    windowStyle = WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VISIBLE;
-#ifdef UNDER_CE
-    sWindowWidth = GetSystemMetrics(SM_CXSCREEN);
-    sWindowHeight = GetSystemMetrics(SM_CYSCREEN);
-    windowX = windowY = 0;
-#else
-    windowStyle |= WS_OVERLAPPEDWINDOW;
-    windowX = CW_USEDEFAULT;
-    windowY = 0;
-#endif
-    sWnd = CreateWindow(sAppName, sAppName, windowStyle,
-                        windowX, windowY,
-                        sWindowWidth, sWindowHeight,
-                        NULL, NULL, instance, NULL);
-    if (!sWnd)
-        return FALSE;
-
-    ShowWindow(sWnd, cmdShow);
-
-#ifdef UNDER_CE
-    SHFullScreen(sWnd,
-                 SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON | SHFS_HIDESTARTICON);
-    MoveWindow(sWnd, 0, 0, sWindowWidth, sWindowHeight, TRUE);
-#endif
-
-    UpdateWindow(sWnd);
-
-    if (!initEGL(sWnd))
-        return FALSE;
-
-    appInit(sWindowWidth, sWindowHeight);
-
-    while (gAppAlive)
-    {
-        while (PeekMessage(&msg, sWnd, 0, 0, PM_NOREMOVE))
-        {
-            if (GetMessage(&msg, sWnd, 0, 0))
-            {
-                TranslateMessage(&msg);
-                DispatchMessage(&msg);
-            }
-            else
-                gAppAlive = 0;
-        }
-
-        if (gAppAlive)
-        {
-            appRender(GetTickCount(), sWindowWidth, sWindowHeight);
-            checkGLErrors();
-            eglSwapBuffers(sEglDisplay, sEglSurface);
-            checkEGLErrors();
-        }
-    }
-
-    appDeinit();
-    deinitEGL();
-
-    return 0;
-}
diff --git a/ndk/apps/san-angeles/project/jni/app.h b/ndk/apps/san-angeles/project/jni/app.h
deleted file mode 100644
index 70ebd35..0000000
--- a/ndk/apps/san-angeles/project/jni/app.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* San Angeles Observation OpenGL ES version example
- * Copyright 2004-2005 Jetro Lauha
- * All rights reserved.
- * Web: http://iki.fi/jetro/
- *
- * This source is free software; you can redistribute it and/or
- * modify it under the terms of EITHER:
- *   (1) The GNU Lesser General Public License as published by the Free
- *       Software Foundation; either version 2.1 of the License, or (at
- *       your option) any later version. The text of the GNU Lesser
- *       General Public License is included with this source in the
- *       file LICENSE-LGPL.txt.
- *   (2) The BSD-style license that is included with this source in
- *       the file LICENSE-BSD.txt.
- *
- * This source is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
- * LICENSE-LGPL.txt and LICENSE-BSD.txt for more details.
- *
- * $Id: app.h,v 1.14 2005/02/06 21:13:54 tonic Exp $
- * $Revision: 1.14 $
- */
-
-#ifndef APP_H_INCLUDED
-#define APP_H_INCLUDED
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define WINDOW_DEFAULT_WIDTH    640
-#define WINDOW_DEFAULT_HEIGHT   480
-
-#define WINDOW_BPP              16
-
-
-// The simple framework expects the application code to define these functions.
-extern void appInit();
-extern void appDeinit();
-extern void appRender(long tick, int width, int height);
-
-/* Value is non-zero when application is alive, and 0 when it is closing.
- * Defined by the application framework.
- */
-extern int gAppAlive;
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif // !APP_H_INCLUDED
diff --git a/ndk/apps/san-angeles/project/jni/cams.h b/ndk/apps/san-angeles/project/jni/cams.h
deleted file mode 100644
index 2b1acb3..0000000
--- a/ndk/apps/san-angeles/project/jni/cams.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* San Angeles Observation OpenGL ES version example
- * Copyright 2004-2005 Jetro Lauha
- * All rights reserved.
- * Web: http://iki.fi/jetro/
- *
- * This source is free software; you can redistribute it and/or
- * modify it under the terms of EITHER:
- *   (1) The GNU Lesser General Public License as published by the Free
- *       Software Foundation; either version 2.1 of the License, or (at
- *       your option) any later version. The text of the GNU Lesser
- *       General Public License is included with this source in the
- *       file LICENSE-LGPL.txt.
- *   (2) The BSD-style license that is included with this source in
- *       the file LICENSE-BSD.txt.
- *
- * This source is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
- * LICENSE-LGPL.txt and LICENSE-BSD.txt for more details.
- *
- * $Id: cams.h,v 1.7 2005/01/31 22:15:15 tonic Exp $
- * $Revision: 1.7 $
- */
-
-#ifndef CAMS_H_INCLUDED
-#define CAMS_H_INCLUDED
-
-
-/* Length in milliseconds of one camera track base unit.
- * The value originates from the music synchronization.
- */
-#define CAMTRACK_LEN    5442
-
-
-// Camera track definition for one camera trucking shot.
-typedef struct
-{
-    /* Five parameters of src[5] and dest[5]:
-     * eyeX, eyeY, eyeZ, viewAngle, viewHeightOffs
-     */
-    short src[5], dest[5];
-    unsigned char dist;     // if >0, cam rotates around eye xy on dist * 0.1
-    unsigned char len;      // length multiplier
-} CAMTRACK;
-
-static CAMTRACK sCamTracks[] =
-{
-    { { 4500, 2700, 100, 70, -30 }, { 50, 50, -90, -100, 0 }, 20, 1 },
-    { { -1448, 4294, 25, 363, 0 }, { -136, 202, 125, -98, 100 }, 0, 1 },
-    { { 1437, 4930, 200, -275, -20 }, { 1684, 0, 0, 9, 0 }, 0, 1 },
-    { { 1800, 3609, 200, 0, 675 }, { 0, 0, 0, 300, 0 }, 0, 1 },
-    { { 923, 996, 50, 2336, -80 }, { 0, -20, -50, 0, 170 }, 0, 1 },
-    { { -1663, -43, 600, 2170, 0 }, { 20, 0, -600, 0, 100 }, 0, 1 },
-    { { 1049, -1420, 175, 2111, -17 }, { 0, 0, 0, -334, 0 }, 0, 2 },
-    { { 0, 0, 50, 300, 25 }, { 0, 0, 0, 300, 0 }, 70, 2 },
-    { { -473, -953, 3500, -353, -350 }, { 0, 0, -2800, 0, 0 }, 0, 2 },
-    { { 191, 1938, 35, 1139, -17 }, { 1205, -2909, 0, 0, 0 }, 0, 2 },
-    { { -1449, -2700, 150, 0, 0 }, { 0, 2000, 0, 0, 0 }, 0, 2 },
-    { { 5273, 4992, 650, 373, -50 }, { -4598, -3072, 0, 0, 0 }, 0, 2 },
-    { { 3223, -3282, 1075, -393, -25 }, { 1649, -1649, 0, 0, 0 }, 0, 2 }
-};
-#define CAMTRACK_COUNT (sizeof(camTracks) / sizeof(camTracks[0]))
-
-
-#endif // !CAMS_H_INCLUDED
diff --git a/ndk/apps/san-angeles/project/jni/demo.c b/ndk/apps/san-angeles/project/jni/demo.c
deleted file mode 100644
index 9cb73d1..0000000
--- a/ndk/apps/san-angeles/project/jni/demo.c
+++ /dev/null
@@ -1,792 +0,0 @@
-/* San Angeles Observation OpenGL ES version example
- * Copyright 2004-2005 Jetro Lauha
- * All rights reserved.
- * Web: http://iki.fi/jetro/
- *
- * This source is free software; you can redistribute it and/or
- * modify it under the terms of EITHER:
- *   (1) The GNU Lesser General Public License as published by the Free
- *       Software Foundation; either version 2.1 of the License, or (at
- *       your option) any later version. The text of the GNU Lesser
- *       General Public License is included with this source in the
- *       file LICENSE-LGPL.txt.
- *   (2) The BSD-style license that is included with this source in
- *       the file LICENSE-BSD.txt.
- *
- * This source is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
- * LICENSE-LGPL.txt and LICENSE-BSD.txt for more details.
- *
- * $Id: demo.c,v 1.10 2005/02/08 20:54:39 tonic Exp $
- * $Revision: 1.10 $
- */
-
-#include <stdlib.h>
-#include <math.h>
-#include <float.h>
-#include <assert.h>
-
-#include "importgl.h"
-
-#include "app.h"
-#include "shapes.h"
-#include "cams.h"
-
-
-// Total run length is 20 * camera track base unit length (see cams.h).
-#define RUN_LENGTH  (20 * CAMTRACK_LEN)
-#undef PI
-#define PI 3.1415926535897932f
-#define RANDOM_UINT_MAX 65535
-
-
-static unsigned long sRandomSeed = 0;
-
-static void seedRandom(unsigned long seed)
-{
-    sRandomSeed = seed;
-}
-
-static unsigned long randomUInt()
-{
-    sRandomSeed = sRandomSeed * 0x343fd + 0x269ec3;
-    return sRandomSeed >> 16;
-}
-
-
-// Capped conversion from float to fixed.
-static long floatToFixed(float value)
-{
-    if (value < -32768) value = -32768;
-    if (value > 32767) value = 32767;
-    return (long)(value * 65536);
-}
-
-#define FIXED(value) floatToFixed(value)
-
-
-// Definition of one GL object in this demo.
-typedef struct {
-    /* Vertex array and color array are enabled for all objects, so their
-     * pointers must always be valid and non-NULL. Normal array is not
-     * used by the ground plane, so when its pointer is NULL then normal
-     * array usage is disabled.
-     *
-     * Vertex array is supposed to use GL_FIXED datatype and stride 0
-     * (i.e. tightly packed array). Color array is supposed to have 4
-     * components per color with GL_UNSIGNED_BYTE datatype and stride 0.
-     * Normal array is supposed to use GL_FIXED datatype and stride 0.
-     */
-    GLfixed *vertexArray;
-    GLubyte *colorArray;
-    GLfixed *normalArray;
-    GLint vertexComponents;
-    GLsizei count;
-} GLOBJECT;
-
-
-static long sStartTick = 0;
-static long sTick = 0;
-
-static int sCurrentCamTrack = 0;
-static long sCurrentCamTrackStartTick = 0;
-static long sNextCamTrackStartTick = 0x7fffffff;
-
-static GLOBJECT *sSuperShapeObjects[SUPERSHAPE_COUNT] = { NULL };
-static GLOBJECT *sGroundPlane = NULL;
-
-
-typedef struct {
-    float x, y, z;
-} VECTOR3;
-
-
-static void freeGLObject(GLOBJECT *object)
-{
-    if (object == NULL)
-        return;
-    free(object->normalArray);
-    free(object->colorArray);
-    free(object->vertexArray);
-    free(object);
-}
-
-
-static GLOBJECT * newGLObject(long vertices, int vertexComponents,
-                              int useNormalArray)
-{
-    GLOBJECT *result;
-    result = (GLOBJECT *)malloc(sizeof(GLOBJECT));
-    if (result == NULL)
-        return NULL;
-    result->count = vertices;
-    result->vertexComponents = vertexComponents;
-    result->vertexArray = (GLfixed *)malloc(vertices * vertexComponents *
-                                            sizeof(GLfixed));
-    result->colorArray = (GLubyte *)malloc(vertices * 4 * sizeof(GLubyte));
-    if (useNormalArray)
-    {
-        result->normalArray = (GLfixed *)malloc(vertices * 3 *
-                                                sizeof(GLfixed));
-    }
-    else
-        result->normalArray = NULL;
-    if (result->vertexArray == NULL ||
-        result->colorArray == NULL ||
-        (useNormalArray && result->normalArray == NULL))
-    {
-        freeGLObject(result);
-        return NULL;
-    }
-    return result;
-}
-
-
-static void drawGLObject(GLOBJECT *object)
-{
-    assert(object != NULL);
-
-    glVertexPointer(object->vertexComponents, GL_FIXED,
-                    0, object->vertexArray);
-    glColorPointer(4, GL_UNSIGNED_BYTE, 0, object->colorArray);
-
-    // Already done in initialization:
-    //glEnableClientState(GL_VERTEX_ARRAY);
-    //glEnableClientState(GL_COLOR_ARRAY);
-
-    if (object->normalArray)
-    {
-        glNormalPointer(GL_FIXED, 0, object->normalArray);
-        glEnableClientState(GL_NORMAL_ARRAY);
-    }
-    else
-        glDisableClientState(GL_NORMAL_ARRAY);
-    glDrawArrays(GL_TRIANGLES, 0, object->count);
-}
-
-
-static void vector3Sub(VECTOR3 *dest, VECTOR3 *v1, VECTOR3 *v2)
-{
-    dest->x = v1->x - v2->x;
-    dest->y = v1->y - v2->y;
-    dest->z = v1->z - v2->z;
-}
-
-
-static void superShapeMap(VECTOR3 *point, float r1, float r2, float t, float p)
-{
-    // sphere-mapping of supershape parameters
-    point->x = (float)(cos(t) * cos(p) / r1 / r2);
-    point->y = (float)(sin(t) * cos(p) / r1 / r2);
-    point->z = (float)(sin(p) / r2);
-}
-
-
-static float ssFunc(const float t, const float *p)
-{
-    return (float)(pow(pow(fabs(cos(p[0] * t / 4)) / p[1], p[4]) +
-                       pow(fabs(sin(p[0] * t / 4)) / p[2], p[5]), 1 / p[3]));
-}
-
-
-// Creates and returns a supershape object.
-// Based on Paul Bourke's POV-Ray implementation.
-// http://astronomy.swin.edu.au/~pbourke/povray/supershape/
-static GLOBJECT * createSuperShape(const float *params)
-{
-    const int resol1 = (int)params[SUPERSHAPE_PARAMS - 3];
-    const int resol2 = (int)params[SUPERSHAPE_PARAMS - 2];
-    // latitude 0 to pi/2 for no mirrored bottom
-    // (latitudeBegin==0 for -pi/2 to pi/2 originally)
-    const int latitudeBegin = resol2 / 4;
-    const int latitudeEnd = resol2 / 2;    // non-inclusive
-    const int longitudeCount = resol1;
-    const int latitudeCount = latitudeEnd - latitudeBegin;
-    const long triangleCount = longitudeCount * latitudeCount * 2;
-    const long vertices = triangleCount * 3;
-    GLOBJECT *result;
-    float baseColor[3];
-    int a, longitude, latitude;
-    long currentVertex, currentQuad;
-
-    result = newGLObject(vertices, 3, 1);
-    if (result == NULL)
-        return NULL;
-
-    for (a = 0; a < 3; ++a)
-        baseColor[a] = ((randomUInt() % 155) + 100) / 255.f;
-
-    currentQuad = 0;
-    currentVertex = 0;
-
-    // longitude -pi to pi
-    for (longitude = 0; longitude < longitudeCount; ++longitude)
-    {
-
-        // latitude 0 to pi/2
-        for (latitude = latitudeBegin; latitude < latitudeEnd; ++latitude)
-        {
-            float t1 = -PI + longitude * 2 * PI / resol1;
-            float t2 = -PI + (longitude + 1) * 2 * PI / resol1;
-            float p1 = -PI / 2 + latitude * 2 * PI / resol2;
-            float p2 = -PI / 2 + (latitude + 1) * 2 * PI / resol2;
-            float r0, r1, r2, r3;
-
-            r0 = ssFunc(t1, params);
-            r1 = ssFunc(p1, &params[6]);
-            r2 = ssFunc(t2, params);
-            r3 = ssFunc(p2, &params[6]);
-
-            if (r0 != 0 && r1 != 0 && r2 != 0 && r3 != 0)
-            {
-                VECTOR3 pa, pb, pc, pd;
-                VECTOR3 v1, v2, n;
-                float ca;
-                int i;
-                //float lenSq, invLenSq;
-
-                superShapeMap(&pa, r0, r1, t1, p1);
-                superShapeMap(&pb, r2, r1, t2, p1);
-                superShapeMap(&pc, r2, r3, t2, p2);
-                superShapeMap(&pd, r0, r3, t1, p2);
-
-                // kludge to set lower edge of the object to fixed level
-                if (latitude == latitudeBegin + 1)
-                    pa.z = pb.z = 0;
-
-                vector3Sub(&v1, &pb, &pa);
-                vector3Sub(&v2, &pd, &pa);
-
-                // Calculate normal with cross product.
-                /*   i    j    k      i    j
-                 * v1.x v1.y v1.z | v1.x v1.y
-                 * v2.x v2.y v2.z | v2.x v2.y
-                 */
-
-                n.x = v1.y * v2.z - v1.z * v2.y;
-                n.y = v1.z * v2.x - v1.x * v2.z;
-                n.z = v1.x * v2.y - v1.y * v2.x;
-
-                /* Pre-normalization of the normals is disabled here because
-                 * they will be normalized anyway later due to automatic
-                 * normalization (GL_NORMALIZE). It is enabled because the
-                 * objects are scaled with glScale.
-                 */
-                /*
-                lenSq = n.x * n.x + n.y * n.y + n.z * n.z;
-                invLenSq = (float)(1 / sqrt(lenSq));
-                n.x *= invLenSq;
-                n.y *= invLenSq;
-                n.z *= invLenSq;
-                */
-
-                ca = pa.z + 0.5f;
-
-                for (i = currentVertex * 3;
-                     i < (currentVertex + 6) * 3;
-                     i += 3)
-                {
-                    result->normalArray[i] = FIXED(n.x);
-                    result->normalArray[i + 1] = FIXED(n.y);
-                    result->normalArray[i + 2] = FIXED(n.z);
-                }
-                for (i = currentVertex * 4;
-                     i < (currentVertex + 6) * 4;
-                     i += 4)
-                {
-                    int a, color[3];
-                    for (a = 0; a < 3; ++a)
-                    {
-                        color[a] = (int)(ca * baseColor[a] * 255);
-                        if (color[a] > 255) color[a] = 255;
-                    }
-                    result->colorArray[i] = (GLubyte)color[0];
-                    result->colorArray[i + 1] = (GLubyte)color[1];
-                    result->colorArray[i + 2] = (GLubyte)color[2];
-                    result->colorArray[i + 3] = 0;
-                }
-                result->vertexArray[currentVertex * 3] = FIXED(pa.x);
-                result->vertexArray[currentVertex * 3 + 1] = FIXED(pa.y);
-                result->vertexArray[currentVertex * 3 + 2] = FIXED(pa.z);
-                ++currentVertex;
-                result->vertexArray[currentVertex * 3] = FIXED(pb.x);
-                result->vertexArray[currentVertex * 3 + 1] = FIXED(pb.y);
-                result->vertexArray[currentVertex * 3 + 2] = FIXED(pb.z);
-                ++currentVertex;
-                result->vertexArray[currentVertex * 3] = FIXED(pd.x);
-                result->vertexArray[currentVertex * 3 + 1] = FIXED(pd.y);
-                result->vertexArray[currentVertex * 3 + 2] = FIXED(pd.z);
-                ++currentVertex;
-                result->vertexArray[currentVertex * 3] = FIXED(pb.x);
-                result->vertexArray[currentVertex * 3 + 1] = FIXED(pb.y);
-                result->vertexArray[currentVertex * 3 + 2] = FIXED(pb.z);
-                ++currentVertex;
-                result->vertexArray[currentVertex * 3] = FIXED(pc.x);
-                result->vertexArray[currentVertex * 3 + 1] = FIXED(pc.y);
-                result->vertexArray[currentVertex * 3 + 2] = FIXED(pc.z);
-                ++currentVertex;
-                result->vertexArray[currentVertex * 3] = FIXED(pd.x);
-                result->vertexArray[currentVertex * 3 + 1] = FIXED(pd.y);
-                result->vertexArray[currentVertex * 3 + 2] = FIXED(pd.z);
-                ++currentVertex;
-            } // r0 && r1 && r2 && r3
-            ++currentQuad;
-        } // latitude
-    } // longitude
-
-    // Set number of vertices in object to the actual amount created.
-    result->count = currentVertex;
-
-    return result;
-}
-
-
-static GLOBJECT * createGroundPlane()
-{
-    const int scale = 4;
-    const int yBegin = -15, yEnd = 15;    // ends are non-inclusive
-    const int xBegin = -15, xEnd = 15;
-    const long triangleCount = (yEnd - yBegin) * (xEnd - xBegin) * 2;
-    const long vertices = triangleCount * 3;
-    GLOBJECT *result;
-    int x, y;
-    long currentVertex, currentQuad;
-
-    result = newGLObject(vertices, 2, 0);
-    if (result == NULL)
-        return NULL;
-
-    currentQuad = 0;
-    currentVertex = 0;
-
-    for (y = yBegin; y < yEnd; ++y)
-    {
-        for (x = xBegin; x < xEnd; ++x)
-        {
-            GLubyte color;
-            int i, a;
-            color = (GLubyte)((randomUInt() & 0x5f) + 81);  // 101 1111
-            for (i = currentVertex * 4; i < (currentVertex + 6) * 4; i += 4)
-            {
-                result->colorArray[i] = color;
-                result->colorArray[i + 1] = color;
-                result->colorArray[i + 2] = color;
-                result->colorArray[i + 3] = 0;
-            }
-
-            // Axis bits for quad triangles:
-            // x: 011100 (0x1c), y: 110001 (0x31)  (clockwise)
-            // x: 001110 (0x0e), y: 100011 (0x23)  (counter-clockwise)
-            for (a = 0; a < 6; ++a)
-            {
-                const int xm = x + ((0x1c >> a) & 1);
-                const int ym = y + ((0x31 >> a) & 1);
-                const float m = (float)(cos(xm * 2) * sin(ym * 4) * 0.75f);
-                result->vertexArray[currentVertex * 2] =
-                    FIXED(xm * scale + m);
-                result->vertexArray[currentVertex * 2 + 1] =
-                    FIXED(ym * scale + m);
-                ++currentVertex;
-            }
-            ++currentQuad;
-        }
-    }
-    return result;
-}
-
-
-static void drawGroundPlane()
-{
-    glDisable(GL_CULL_FACE);
-    glDisable(GL_DEPTH_TEST);
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_ZERO, GL_SRC_COLOR);
-    glDisable(GL_LIGHTING);
-
-    drawGLObject(sGroundPlane);
-
-    glEnable(GL_LIGHTING);
-    glDisable(GL_BLEND);
-    glEnable(GL_DEPTH_TEST);
-}
-
-
-static void drawFadeQuad()
-{
-    static const GLfixed quadVertices[] = {
-        -0x10000, -0x10000,
-         0x10000, -0x10000,
-        -0x10000,  0x10000,
-         0x10000, -0x10000,
-         0x10000,  0x10000,
-        -0x10000,  0x10000
-    };
-
-    const int beginFade = sTick - sCurrentCamTrackStartTick;
-    const int endFade = sNextCamTrackStartTick - sTick;
-    const int minFade = beginFade < endFade ? beginFade : endFade;
-
-    if (minFade < 1024)
-    {
-        const GLfixed fadeColor = minFade << 6;
-        glColor4x(fadeColor, fadeColor, fadeColor, 0);
-
-        glDisable(GL_DEPTH_TEST);
-        glEnable(GL_BLEND);
-        glBlendFunc(GL_ZERO, GL_SRC_COLOR);
-        glDisable(GL_LIGHTING);
-
-        glMatrixMode(GL_MODELVIEW);
-        glLoadIdentity();
-
-        glMatrixMode(GL_PROJECTION);
-        glLoadIdentity();
-
-        glDisableClientState(GL_COLOR_ARRAY);
-        glDisableClientState(GL_NORMAL_ARRAY);
-        glVertexPointer(2, GL_FIXED, 0, quadVertices);
-        glDrawArrays(GL_TRIANGLES, 0, 6);
-
-        glEnableClientState(GL_COLOR_ARRAY);
-
-        glMatrixMode(GL_MODELVIEW);
-
-        glEnable(GL_LIGHTING);
-        glDisable(GL_BLEND);
-        glEnable(GL_DEPTH_TEST);
-    }
-}
-
-
-// Called from the app framework.
-void appInit()
-{
-    int a;
-
-    glEnable(GL_NORMALIZE);
-    glEnable(GL_DEPTH_TEST);
-    glDisable(GL_CULL_FACE);
-    glShadeModel(GL_FLAT);
-
-    glEnable(GL_LIGHTING);
-    glEnable(GL_LIGHT0);
-    glEnable(GL_LIGHT1);
-    glEnable(GL_LIGHT2);
-
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glEnableClientState(GL_COLOR_ARRAY);
-
-    seedRandom(15);
-
-    for (a = 0; a < SUPERSHAPE_COUNT; ++a)
-    {
-        sSuperShapeObjects[a] = createSuperShape(sSuperShapeParams[a]);
-        assert(sSuperShapeObjects[a] != NULL);
-    }
-    sGroundPlane = createGroundPlane();
-    assert(sGroundPlane != NULL);
-}
-
-
-// Called from the app framework.
-void appDeinit()
-{
-    int a;
-    for (a = 0; a < SUPERSHAPE_COUNT; ++a)
-        freeGLObject(sSuperShapeObjects[a]);
-    freeGLObject(sGroundPlane);
-}
-
-
-static void gluPerspective(GLfloat fovy, GLfloat aspect,
-                           GLfloat zNear, GLfloat zFar)
-{
-    GLfloat xmin, xmax, ymin, ymax;
-
-    ymax = zNear * (GLfloat)tan(fovy * PI / 360);
-    ymin = -ymax;
-    xmin = ymin * aspect;
-    xmax = ymax * aspect;
-
-    glFrustumx((GLfixed)(xmin * 65536), (GLfixed)(xmax * 65536),
-               (GLfixed)(ymin * 65536), (GLfixed)(ymax * 65536),
-               (GLfixed)(zNear * 65536), (GLfixed)(zFar * 65536));
-}
-
-
-static void prepareFrame(int width, int height)
-{
-    glViewport(0, 0, width, height);
-
-    glClearColorx((GLfixed)(0.1f * 65536),
-                  (GLfixed)(0.2f * 65536),
-                  (GLfixed)(0.3f * 65536), 0x10000);
-    glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
-
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    gluPerspective(45, (float)width / height, 0.5f, 150);
-
-    glMatrixMode(GL_MODELVIEW);
-
-    glLoadIdentity();
-}
-
-
-static void configureLightAndMaterial()
-{
-    static GLfixed light0Position[] = { -0x40000, 0x10000, 0x10000, 0 };
-    static GLfixed light0Diffuse[] = { 0x10000, 0x6666, 0, 0x10000 };
-    static GLfixed light1Position[] = { 0x10000, -0x20000, -0x10000, 0 };
-    static GLfixed light1Diffuse[] = { 0x11eb, 0x23d7, 0x5999, 0x10000 };
-    static GLfixed light2Position[] = { -0x10000, 0, -0x40000, 0 };
-    static GLfixed light2Diffuse[] = { 0x11eb, 0x2b85, 0x23d7, 0x10000 };
-    static GLfixed materialSpecular[] = { 0x10000, 0x10000, 0x10000, 0x10000 };
-
-    glLightxv(GL_LIGHT0, GL_POSITION, light0Position);
-    glLightxv(GL_LIGHT0, GL_DIFFUSE, light0Diffuse);
-    glLightxv(GL_LIGHT1, GL_POSITION, light1Position);
-    glLightxv(GL_LIGHT1, GL_DIFFUSE, light1Diffuse);
-    glLightxv(GL_LIGHT2, GL_POSITION, light2Position);
-    glLightxv(GL_LIGHT2, GL_DIFFUSE, light2Diffuse);
-    glMaterialxv(GL_FRONT_AND_BACK, GL_SPECULAR, materialSpecular);
-
-    glMaterialx(GL_FRONT_AND_BACK, GL_SHININESS, 60 << 16);
-    glEnable(GL_COLOR_MATERIAL);
-}
-
-
-static void drawModels(float zScale)
-{
-    const int translationScale = 9;
-    int x, y;
-
-    seedRandom(9);
-
-    glScalex(1 << 16, 1 << 16, (GLfixed)(zScale * 65536));
-
-    for (y = -5; y <= 5; ++y)
-    {
-        for (x = -5; x <= 5; ++x)
-        {
-            float buildingScale;
-            GLfixed fixedScale;
-
-            int curShape = randomUInt() % SUPERSHAPE_COUNT;
-            buildingScale = sSuperShapeParams[curShape][SUPERSHAPE_PARAMS - 1];
-            fixedScale = (GLfixed)(buildingScale * 65536);
-
-            glPushMatrix();
-            glTranslatex((x * translationScale) * 65536,
-                         (y * translationScale) * 65536,
-                         0);
-            glRotatex((GLfixed)((randomUInt() % 360) << 16), 0, 0, 1 << 16);
-            glScalex(fixedScale, fixedScale, fixedScale);
-
-            drawGLObject(sSuperShapeObjects[curShape]);
-            glPopMatrix();
-        }
-    }
-
-    for (x = -2; x <= 2; ++x)
-    {
-        const int shipScale100 = translationScale * 500;
-        const int offs100 = x * shipScale100 + (sTick % shipScale100);
-        float offs = offs100 * 0.01f;
-        GLfixed fixedOffs = (GLfixed)(offs * 65536);
-        glPushMatrix();
-        glTranslatex(fixedOffs, -4 * 65536, 2 << 16);
-        drawGLObject(sSuperShapeObjects[SUPERSHAPE_COUNT - 1]);
-        glPopMatrix();
-        glPushMatrix();
-        glTranslatex(-4 * 65536, fixedOffs, 4 << 16);
-        glRotatex(90 << 16, 0, 0, 1 << 16);
-        drawGLObject(sSuperShapeObjects[SUPERSHAPE_COUNT - 1]);
-        glPopMatrix();
-    }
-}
-
-
-/* Following gluLookAt implementation is adapted from the
- * Mesa 3D Graphics library. http://www.mesa3d.org
- */
-static void gluLookAt(GLfloat eyex, GLfloat eyey, GLfloat eyez,
-	              GLfloat centerx, GLfloat centery, GLfloat centerz,
-	              GLfloat upx, GLfloat upy, GLfloat upz)
-{
-    GLfloat m[16];
-    GLfloat x[3], y[3], z[3];
-    GLfloat mag;
-
-    /* Make rotation matrix */
-
-    /* Z vector */
-    z[0] = eyex - centerx;
-    z[1] = eyey - centery;
-    z[2] = eyez - centerz;
-    mag = (float)sqrt(z[0] * z[0] + z[1] * z[1] + z[2] * z[2]);
-    if (mag) {			/* mpichler, 19950515 */
-        z[0] /= mag;
-        z[1] /= mag;
-        z[2] /= mag;
-    }
-
-    /* Y vector */
-    y[0] = upx;
-    y[1] = upy;
-    y[2] = upz;
-
-    /* X vector = Y cross Z */
-    x[0] = y[1] * z[2] - y[2] * z[1];
-    x[1] = -y[0] * z[2] + y[2] * z[0];
-    x[2] = y[0] * z[1] - y[1] * z[0];
-
-    /* Recompute Y = Z cross X */
-    y[0] = z[1] * x[2] - z[2] * x[1];
-    y[1] = -z[0] * x[2] + z[2] * x[0];
-    y[2] = z[0] * x[1] - z[1] * x[0];
-
-    /* mpichler, 19950515 */
-    /* cross product gives area of parallelogram, which is < 1.0 for
-     * non-perpendicular unit-length vectors; so normalize x, y here
-     */
-
-    mag = (float)sqrt(x[0] * x[0] + x[1] * x[1] + x[2] * x[2]);
-    if (mag) {
-        x[0] /= mag;
-        x[1] /= mag;
-        x[2] /= mag;
-    }
-
-    mag = (float)sqrt(y[0] * y[0] + y[1] * y[1] + y[2] * y[2]);
-    if (mag) {
-        y[0] /= mag;
-        y[1] /= mag;
-        y[2] /= mag;
-    }
-
-#define M(row,col)  m[col*4+row]
-    M(0, 0) = x[0];
-    M(0, 1) = x[1];
-    M(0, 2) = x[2];
-    M(0, 3) = 0.0;
-    M(1, 0) = y[0];
-    M(1, 1) = y[1];
-    M(1, 2) = y[2];
-    M(1, 3) = 0.0;
-    M(2, 0) = z[0];
-    M(2, 1) = z[1];
-    M(2, 2) = z[2];
-    M(2, 3) = 0.0;
-    M(3, 0) = 0.0;
-    M(3, 1) = 0.0;
-    M(3, 2) = 0.0;
-    M(3, 3) = 1.0;
-#undef M
-    {
-        int a;
-        GLfixed fixedM[16];
-        for (a = 0; a < 16; ++a)
-            fixedM[a] = (GLfixed)(m[a] * 65536);
-        glMultMatrixx(fixedM);
-    }
-
-    /* Translate Eye to Origin */
-    glTranslatex((GLfixed)(-eyex * 65536),
-                 (GLfixed)(-eyey * 65536),
-                 (GLfixed)(-eyez * 65536));
-}
-
-
-static void camTrack()
-{
-    float lerp[5];
-    float eX, eY, eZ, cX, cY, cZ;
-    float trackPos;
-    CAMTRACK *cam;
-    long currentCamTick;
-    int a;
-
-    if (sNextCamTrackStartTick <= sTick)
-    {
-        ++sCurrentCamTrack;
-        sCurrentCamTrackStartTick = sNextCamTrackStartTick;
-    }
-    sNextCamTrackStartTick = sCurrentCamTrackStartTick +
-                             sCamTracks[sCurrentCamTrack].len * CAMTRACK_LEN;
-
-    cam = &sCamTracks[sCurrentCamTrack];
-    currentCamTick = sTick - sCurrentCamTrackStartTick;
-    trackPos = (float)currentCamTick / (CAMTRACK_LEN * cam->len);
-
-    for (a = 0; a < 5; ++a)
-        lerp[a] = (cam->src[a] + cam->dest[a] * trackPos) * 0.01f;
-
-    if (cam->dist)
-    {
-        float dist = cam->dist * 0.1f;
-        cX = lerp[0];
-        cY = lerp[1];
-        cZ = lerp[2];
-        eX = cX - (float)cos(lerp[3]) * dist;
-        eY = cY - (float)sin(lerp[3]) * dist;
-        eZ = cZ - lerp[4];
-    }
-    else
-    {
-        eX = lerp[0];
-        eY = lerp[1];
-        eZ = lerp[2];
-        cX = eX + (float)cos(lerp[3]);
-        cY = eY + (float)sin(lerp[3]);
-        cZ = eZ + lerp[4];
-    }
-    gluLookAt(eX, eY, eZ, cX, cY, cZ, 0, 0, 1);
-}
-
-
-// Called from the app framework.
-/* The tick is current time in milliseconds, width and height
- * are the image dimensions to be rendered.
- */
-void appRender(long tick, int width, int height)
-{
-    if (sStartTick == 0)
-        sStartTick = tick;
-    if (!gAppAlive)
-        return;
-
-    // Actual tick value is "blurred" a little bit.
-    sTick = (sTick + tick - sStartTick) >> 1;
-
-    // Terminate application after running through the demonstration once.
-    if (sTick >= RUN_LENGTH)
-    {
-        gAppAlive = 0;
-        return;
-    }
-
-    // Prepare OpenGL ES for rendering of the frame.
-    prepareFrame(width, height);
-
-    // Update the camera position and set the lookat.
-    camTrack();
-
-    // Configure environment.
-    configureLightAndMaterial();
-
-    // Draw the reflection by drawing models with negated Z-axis.
-    glPushMatrix();
-    drawModels(-1);
-    glPopMatrix();
-
-    // Blend the ground plane to the window.
-    drawGroundPlane();
-
-    // Draw all the models normally.
-    drawModels(1);
-
-    // Draw fade quad over whole window (when changing cameras).
-    drawFadeQuad();
-}
diff --git a/ndk/apps/san-angeles/project/jni/importgl.c b/ndk/apps/san-angeles/project/jni/importgl.c
deleted file mode 100644
index f501636..0000000
--- a/ndk/apps/san-angeles/project/jni/importgl.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* San Angeles Observation OpenGL ES version example
- * Copyright 2004-2005 Jetro Lauha
- * All rights reserved.
- * Web: http://iki.fi/jetro/
- *
- * This source is free software; you can redistribute it and/or
- * modify it under the terms of EITHER:
- *   (1) The GNU Lesser General Public License as published by the Free
- *       Software Foundation; either version 2.1 of the License, or (at
- *       your option) any later version. The text of the GNU Lesser
- *       General Public License is included with this source in the
- *       file LICENSE-LGPL.txt.
- *   (2) The BSD-style license that is included with this source in
- *       the file LICENSE-BSD.txt.
- *
- * This source is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
- * LICENSE-LGPL.txt and LICENSE-BSD.txt for more details.
- *
- * $Id: importgl.c,v 1.4 2005/02/08 18:42:55 tonic Exp $
- * $Revision: 1.4 $
- */
-
-#undef WIN32
-#undef LINUX
-#ifdef _MSC_VER
-// Desktop or mobile Win32 environment:
-#define WIN32
-#else
-// Linux environment:
-#define LINUX
-#endif
-
-#ifndef DISABLE_IMPORTGL
-
-#if defined(WIN32)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <tchar.h>
-static HMODULE sGLESDLL = NULL;
-#endif // WIN32
-
-#ifdef LINUX
-#include <stdlib.h>
-#include <dlfcn.h>
-static void *sGLESSO = NULL;
-#endif // LINUX
-
-#endif /* DISABLE_IMPORTGL */
-
-#define IMPORTGL_NO_FNPTR_DEFS
-#define IMPORTGL_API
-#define IMPORTGL_FNPTRINIT = NULL
-#include "importgl.h"
-
-
-/* Imports function pointers to selected function calls in OpenGL ES Common
- * or Common Lite profile DLL or shared object. The function pointers are
- * stored as global symbols with equivalent function name but prefixed with
- * "funcPtr_". Standard gl/egl calls are redirected to the function pointers
- * with preprocessor macros (see importgl.h).
- */
-int importGLInit()
-{
-    int result = 1;
-
-#ifndef DISABLE_IMPORTGL
-
-#undef IMPORT_FUNC
-
-#ifdef WIN32
-    sGLESDLL = LoadLibrary(_T("libGLES_CM.dll"));
-    if (sGLESDLL == NULL)
-        sGLESDLL = LoadLibrary(_T("libGLES_CL.dll"));
-    if (sGLESDLL == NULL)
-        return 0;   // Cannot find OpenGL ES Common or Common Lite DLL.
-
-    /* The following fetches address to each egl & gl function call
-     * and stores it to the related function pointer. Casting through
-     * void * results in warnings with VC warning level 4, which
-     * could be fixed by casting to the true type for each fetch.
-     */
-#define IMPORT_FUNC(funcName) do { \
-        void *procAddress = (void *)GetProcAddress(sGLESDLL, _T(#funcName)); \
-        if (procAddress == NULL) result = 0; \
-        *((void **)&FNPTR(funcName)) = procAddress; } while (0)
-#endif // WIN32
-
-#ifdef LINUX
-#ifdef ANDROID_NDK
-    sGLESSO = dlopen("libGLESv1_CM.so", RTLD_NOW);
-#else /* !ANDROID_NDK */
-    sGLESSO = dlopen("libGLES_CM.so", RTLD_NOW);
-    if (sGLESSO == NULL)
-        sGLESSO = dlopen("libGLES_CL.so", RTLD_NOW);
-#endif /* !ANDROID_NDK */
-    if (sGLESSO == NULL)
-        return 0;   // Cannot find OpenGL ES Common or Common Lite SO.
-
-#define IMPORT_FUNC(funcName) do { \
-        void *procAddress = (void *)dlsym(sGLESSO, #funcName); \
-        if (procAddress == NULL) result = 0; \
-        *((void **)&FNPTR(funcName)) = procAddress; } while (0)
-#endif // LINUX
-
-#ifndef ANDROID_NDK
-    IMPORT_FUNC(eglChooseConfig);
-    IMPORT_FUNC(eglCreateContext);
-    IMPORT_FUNC(eglCreateWindowSurface);
-    IMPORT_FUNC(eglDestroyContext);
-    IMPORT_FUNC(eglDestroySurface);
-    IMPORT_FUNC(eglGetConfigAttrib);
-    IMPORT_FUNC(eglGetConfigs);
-    IMPORT_FUNC(eglGetDisplay);
-    IMPORT_FUNC(eglGetError);
-    IMPORT_FUNC(eglInitialize);
-    IMPORT_FUNC(eglMakeCurrent);
-    IMPORT_FUNC(eglSwapBuffers);
-    IMPORT_FUNC(eglTerminate);
-#endif /* !ANDROID_NDK */
-
-    IMPORT_FUNC(glBlendFunc);
-    IMPORT_FUNC(glClear);
-    IMPORT_FUNC(glClearColorx);
-    IMPORT_FUNC(glColor4x);
-    IMPORT_FUNC(glColorPointer);
-    IMPORT_FUNC(glDisable);
-    IMPORT_FUNC(glDisableClientState);
-    IMPORT_FUNC(glDrawArrays);
-    IMPORT_FUNC(glEnable);
-    IMPORT_FUNC(glEnableClientState);
-    IMPORT_FUNC(glFrustumx);
-    IMPORT_FUNC(glGetError);
-    IMPORT_FUNC(glLightxv);
-    IMPORT_FUNC(glLoadIdentity);
-    IMPORT_FUNC(glMaterialx);
-    IMPORT_FUNC(glMaterialxv);
-    IMPORT_FUNC(glMatrixMode);
-    IMPORT_FUNC(glMultMatrixx);
-    IMPORT_FUNC(glNormalPointer);
-    IMPORT_FUNC(glPopMatrix);
-    IMPORT_FUNC(glPushMatrix);
-    IMPORT_FUNC(glRotatex);
-    IMPORT_FUNC(glScalex);
-    IMPORT_FUNC(glShadeModel);
-    IMPORT_FUNC(glTranslatex);
-    IMPORT_FUNC(glVertexPointer);
-    IMPORT_FUNC(glViewport);
-
-#endif /* DISABLE_IMPORTGL */
-
-    return result;
-}
-
-
-void importGLDeinit()
-{
-#ifndef DISABLE_IMPORTGL
-#ifdef WIN32
-    FreeLibrary(sGLESDLL);
-#endif
-
-#ifdef LINUX
-    dlclose(sGLESSO);
-#endif
-#endif /* DISABLE_IMPORTGL */
-}
diff --git a/ndk/apps/san-angeles/project/jni/importgl.h b/ndk/apps/san-angeles/project/jni/importgl.h
deleted file mode 100644
index b05e0c8..0000000
--- a/ndk/apps/san-angeles/project/jni/importgl.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* San Angeles Observation OpenGL ES version example
- * Copyright 2004-2005 Jetro Lauha
- * All rights reserved.
- * Web: http://iki.fi/jetro/
- *
- * This source is free software; you can redistribute it and/or
- * modify it under the terms of EITHER:
- *   (1) The GNU Lesser General Public License as published by the Free
- *       Software Foundation; either version 2.1 of the License, or (at
- *       your option) any later version. The text of the GNU Lesser
- *       General Public License is included with this source in the
- *       file LICENSE-LGPL.txt.
- *   (2) The BSD-style license that is included with this source in
- *       the file LICENSE-BSD.txt.
- *
- * This source is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
- * LICENSE-LGPL.txt and LICENSE-BSD.txt for more details.
- *
- * $Id: importgl.h,v 1.4 2005/02/24 20:29:33 tonic Exp $
- * $Revision: 1.4 $
- */
-
-#ifndef IMPORTGL_H_INCLUDED
-#define IMPORTGL_H_INCLUDED
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#include <GLES/gl.h>
-#ifndef ANDROID_NDK
-#include <GLES/egl.h>
-#endif /* !ANDROID_NDK */
-
-/* Use DISABLE_IMPORTGL if you want to link the OpenGL ES at
- * compile/link time and not import it dynamically runtime.
- */
-#ifndef DISABLE_IMPORTGL
-
-
-/* Dynamically fetches pointers to the egl & gl functions.
- * Should be called once on application initialization.
- * Returns non-zero on success and 0 on failure.
- */
-extern int importGLInit();
-
-/* Frees the handle to egl & gl functions library.
- */
-extern void importGLDeinit();
-
-
-#ifndef IMPORTGL_API
-#define IMPORTGL_API extern
-#endif
-#ifndef IMPORTGL_FNPTRINIT
-#define IMPORTGL_FNPTRINIT
-#endif
-
-#define FNDEF(retType, funcName, args) IMPORTGL_API retType (*funcPtr_##funcName) args IMPORTGL_FNPTRINIT
-
-#ifndef ANDROID_NDK
-FNDEF(EGLBoolean, eglChooseConfig, (EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config));
-FNDEF(EGLContext, eglCreateContext, (EGLDisplay dpy, EGLConfig config, EGLContext share_list, const EGLint *attrib_list));
-FNDEF(EGLSurface, eglCreateWindowSurface, (EGLDisplay dpy, EGLConfig config, NativeWindowType window, const EGLint *attrib_list));
-FNDEF(EGLBoolean, eglDestroyContext, (EGLDisplay dpy, EGLContext ctx));
-FNDEF(EGLBoolean, eglDestroySurface, (EGLDisplay dpy, EGLSurface surface));
-FNDEF(EGLBoolean, eglGetConfigAttrib, (EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value));
-FNDEF(EGLBoolean, eglGetConfigs, (EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config));
-FNDEF(EGLDisplay, eglGetDisplay, (NativeDisplayType display));
-FNDEF(EGLint, eglGetError, (void));
-FNDEF(EGLBoolean, eglInitialize, (EGLDisplay dpy, EGLint *major, EGLint *minor));
-FNDEF(EGLBoolean, eglMakeCurrent, (EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx));
-FNDEF(EGLBoolean, eglSwapBuffers, (EGLDisplay dpy, EGLSurface draw));
-FNDEF(EGLBoolean, eglTerminate, (EGLDisplay dpy));
-#endif /* !ANDROID_NDK */
-
-FNDEF(void, glBlendFunc, (GLenum sfactor, GLenum dfactor));
-FNDEF(void, glClear, (GLbitfield mask));
-FNDEF(void, glClearColorx, (GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha));
-FNDEF(void, glColor4x, (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha));
-FNDEF(void, glColorPointer, (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer));
-FNDEF(void, glDisable, (GLenum cap));
-FNDEF(void, glDisableClientState, (GLenum array));
-FNDEF(void, glDrawArrays, (GLenum mode, GLint first, GLsizei count));
-FNDEF(void, glEnable, (GLenum cap));
-FNDEF(void, glEnableClientState, (GLenum array));
-FNDEF(void, glFrustumx, (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar));
-FNDEF(GLenum, glGetError, (void));
-FNDEF(void, glLightxv, (GLenum light, GLenum pname, const GLfixed *params));
-FNDEF(void, glLoadIdentity, (void));
-FNDEF(void, glMaterialx, (GLenum face, GLenum pname, GLfixed param));
-FNDEF(void, glMaterialxv, (GLenum face, GLenum pname, const GLfixed *params));
-FNDEF(void, glMatrixMode, (GLenum mode));
-FNDEF(void, glMultMatrixx, (const GLfixed *m));
-FNDEF(void, glNormalPointer, (GLenum type, GLsizei stride, const GLvoid *pointer));
-FNDEF(void, glPopMatrix, (void));
-FNDEF(void, glPushMatrix, (void));
-FNDEF(void, glRotatex, (GLfixed angle, GLfixed x, GLfixed y, GLfixed z));
-FNDEF(void, glScalex, (GLfixed x, GLfixed y, GLfixed z));
-FNDEF(void, glShadeModel, (GLenum mode));
-FNDEF(void, glTranslatex, (GLfixed x, GLfixed y, GLfixed z));
-FNDEF(void, glVertexPointer, (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer));
-FNDEF(void, glViewport, (GLint x, GLint y, GLsizei width, GLsizei height));
-
-
-#undef FN
-#define FNPTR(name) funcPtr_##name
-
-#ifndef IMPORTGL_NO_FNPTR_DEFS
-
-// Redirect egl* and gl* function calls to funcPtr_egl* and funcPtr_gl*.
-
-#ifndef ANDROID_NDK
-#define eglChooseConfig         FNPTR(eglChooseConfig)
-#define eglCreateContext        FNPTR(eglCreateContext)
-#define eglCreateWindowSurface  FNPTR(eglCreateWindowSurface)
-#define eglDestroyContext       FNPTR(eglDestroyContext)
-#define eglDestroySurface       FNPTR(eglDestroySurface)
-#define eglGetConfigAttrib      FNPTR(eglGetConfigAttrib)
-#define eglGetConfigs           FNPTR(eglGetConfigs)
-#define eglGetDisplay           FNPTR(eglGetDisplay)
-#define eglGetError             FNPTR(eglGetError)
-#define eglInitialize           FNPTR(eglInitialize)
-#define eglMakeCurrent          FNPTR(eglMakeCurrent)
-#define eglSwapBuffers          FNPTR(eglSwapBuffers)
-#define eglTerminate            FNPTR(eglTerminate)
-#endif /* !ANDROID_NDK */
-
-#define glBlendFunc             FNPTR(glBlendFunc)
-#define glClear                 FNPTR(glClear)
-#define glClearColorx           FNPTR(glClearColorx)
-#define glColor4x               FNPTR(glColor4x)
-#define glColorPointer          FNPTR(glColorPointer)
-#define glDisable               FNPTR(glDisable)
-#define glDisableClientState    FNPTR(glDisableClientState)
-#define glDrawArrays            FNPTR(glDrawArrays)
-#define glEnable                FNPTR(glEnable)
-#define glEnableClientState     FNPTR(glEnableClientState)
-#define glFrustumx              FNPTR(glFrustumx)
-#define glGetError              FNPTR(glGetError)
-#define glLightxv               FNPTR(glLightxv)
-#define glLoadIdentity          FNPTR(glLoadIdentity)
-#define glMaterialx             FNPTR(glMaterialx)
-#define glMaterialxv            FNPTR(glMaterialxv)
-#define glMatrixMode            FNPTR(glMatrixMode)
-#define glMultMatrixx           FNPTR(glMultMatrixx)
-#define glNormalPointer         FNPTR(glNormalPointer)
-#define glPopMatrix             FNPTR(glPopMatrix)
-#define glPushMatrix            FNPTR(glPushMatrix)
-#define glRotatex               FNPTR(glRotatex)
-#define glScalex                FNPTR(glScalex)
-#define glShadeModel            FNPTR(glShadeModel)
-#define glTranslatex            FNPTR(glTranslatex)
-#define glVertexPointer         FNPTR(glVertexPointer)
-#define glViewport              FNPTR(glViewport)
-
-#endif // !IMPORTGL_NO_FNPTR_DEFS
-
-
-#endif // !DISABLE_IMPORTGL
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif // !IMPORTGL_H_INCLUDED
diff --git a/ndk/apps/san-angeles/project/jni/license-BSD.txt b/ndk/apps/san-angeles/project/jni/license-BSD.txt
deleted file mode 100644
index 8924e3c..0000000
--- a/ndk/apps/san-angeles/project/jni/license-BSD.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-This is the BSD-style license for the "San Angeles Observation"

-OpenGL ES version example source code

----------------------------------------------------------------

-

-San Angeles Observation OpenGL ES version example

-Copyright (c) 2004-2005, Jetro Lauha

-All rights reserved.

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions

-are met:

-

-    * Redistributions of source code must retain the above copyright

-      notice, this list of conditions and the following disclaimer.

-    * Redistributions in binary form must reproduce the above copyright

-      notice, this list of conditions and the following disclaimer in

-      the documentation and/or other materials provided with the

-      distribution.

-    * Neither the name of the software product's copyright owner nor

-      the names of its contributors may be used to endorse or promote

-      products derived from this software without specific prior written

-      permission.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED

-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/ndk/apps/san-angeles/project/jni/license-LGPL.txt b/ndk/apps/san-angeles/project/jni/license-LGPL.txt
deleted file mode 100644
index b1e3f5a..0000000
--- a/ndk/apps/san-angeles/project/jni/license-LGPL.txt
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/ndk/apps/san-angeles/project/jni/license.txt b/ndk/apps/san-angeles/project/jni/license.txt
deleted file mode 100644
index 620841e..0000000
--- a/ndk/apps/san-angeles/project/jni/license.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-San Angeles Observation OpenGL ES version example

-Copyright 2004-2005 Jetro Lauha

-All rights reserved.

-Web: http://iki.fi/jetro/

-

-This source is free software; you can redistribute it and/or

-modify it under the terms of EITHER:

-  (1) The GNU Lesser General Public License as published by the Free

-      Software Foundation; either version 2.1 of the License, or (at

-      your option) any later version. The text of the GNU Lesser

-      General Public License is included with this source in the

-      file LICENSE-LGPL.txt.

-  (2) The BSD-style license that is included with this source in

-      the file LICENSE-BSD.txt.

-

-This source is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files

-LICENSE-LGPL.txt and LICENSE-BSD.txt for more details.

diff --git a/ndk/apps/san-angeles/project/jni/shapes.h b/ndk/apps/san-angeles/project/jni/shapes.h
deleted file mode 100644
index 25ffae8..0000000
--- a/ndk/apps/san-angeles/project/jni/shapes.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* San Angeles Observation OpenGL ES version example
- * Copyright 2004-2005 Jetro Lauha
- * All rights reserved.
- * Web: http://iki.fi/jetro/
- *
- * This source is free software; you can redistribute it and/or
- * modify it under the terms of EITHER:
- *   (1) The GNU Lesser General Public License as published by the Free
- *       Software Foundation; either version 2.1 of the License, or (at
- *       your option) any later version. The text of the GNU Lesser
- *       General Public License is included with this source in the
- *       file LICENSE-LGPL.txt.
- *   (2) The BSD-style license that is included with this source in
- *       the file LICENSE-BSD.txt.
- *
- * This source is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files
- * LICENSE-LGPL.txt and LICENSE-BSD.txt for more details.
- *
- * $Id: shapes.h,v 1.6 2005/01/31 22:15:30 tonic Exp $
- * $Revision: 1.6 $
- */
-
-#ifndef SHAPES_H_INCLUDED
-#define SHAPES_H_INCLUDED
-
-
-#define SUPERSHAPE_PARAMS 15
-
-static const float sSuperShapeParams[][SUPERSHAPE_PARAMS] =
-{
-    // m  a     b     n1      n2     n3     m     a     b     n1     n2      n3   res1 res2 scale  (org.res1,res2)
-    { 10, 1,    2,    90,      1,   -45,    8,    1,    1,    -1,     1,  -0.4f,   20,  30, 2 }, // 40, 60
-    { 10, 1,    2,    90,      1,   -45,    4,    1,    1,    10,     1,  -0.4f,   20,  20, 4 }, // 40, 40
-    { 10, 1,    2,    60,      1,   -10,    4,    1,    1,    -1,    -2,  -0.4f,   41,  41, 1 }, // 82, 82
-    {  6, 1,    1,    60,      1,   -70,    8,    1,    1,  0.4f,     3,  0.25f,   20,  20, 1 }, // 40, 40
-    {  4, 1,    1,    30,      1,    20,   12,    1,    1,  0.4f,     3,  0.25f,   10,  30, 1 }, // 20, 60
-    {  8, 1,    1,    30,      1,    -4,    8,    2,    1,    -1,     5,   0.5f,   25,  26, 1 }, // 60, 60
-    { 13, 1,    1,    30,      1,    -4,   13,    1,    1,     1,     5,      1,   30,  30, 6 }, // 60, 60
-    { 10, 1, 1.1f, -0.5f,   0.1f,    70,   60,    1,    1,   -90,     0, -0.25f,   20,  60, 8 }, // 60, 180
-    {  7, 1,    1,    20,  -0.3f, -3.5f,    6,    1,    1,    -1,  4.5f,   0.5f,   10,  20, 4 }, // 60, 80
-    {  4, 1,    1,    10,     10,    10,    4,    1,    1,    10,    10,     10,   10,  20, 1 }, // 20, 40
-    {  4, 1,    1,     1,      1,     1,    4,    1,    1,     1,     1,      1,   10,  10, 2 }, // 10, 10
-    {  1, 1,    1,    38, -0.25f,    19,    4,    1,    1,    10,    10,     10,   10,  15, 2 }, // 20, 40
-    {  2, 1,    1,  0.7f,   0.3f,  0.2f,    3,    1,    1,   100,   100,    100,   10,  25, 2 }, // 20, 50
-    {  6, 1,    1,     1,      1,     1,    3,    1,    1,     1,     1,      1,   30,  30, 2 }, // 60, 60
-    {  3, 1,    1,     1,      1,     1,    6,    1,    1,     2,     1,      1,   10,  20, 2 }, // 20, 40
-    {  6, 1,    1,     6,   5.5f,   100,    6,    1,    1,    25,    10,     10,   30,  20, 2 }, // 60, 40
-    {  3, 1,    1,  0.5f,   1.7f,  1.7f,    2,    1,    1,    10,    10,     10,   20,  20, 2 }, // 40, 40
-    {  5, 1,    1,  0.1f,   1.7f,  1.7f,    1,    1,    1,  0.3f,  0.5f,   0.5f,   20,  20, 4 }, // 40, 40
-    {  2, 1,    1,     6,   5.5f,   100,    6,    1,    1,     4,    10,     10,   10,  22, 1 }, // 40, 40
-    {  6, 1,    1,    -1,     70,  0.1f,    9,    1, 0.5f,   -98, 0.05f,    -45,   20,  30, 4 }, // 60, 91
-    {  6, 1,    1,    -1,     90, -0.1f,    7,    1,    1,    90,  1.3f,     34,   13,  16, 1 }, // 32, 60
-};
-#define SUPERSHAPE_COUNT (sizeof(sSuperShapeParams) / sizeof(sSuperShapeParams[0]))
-
-
-#endif // !SHAPES_H_INCLUDED
diff --git a/ndk/apps/san-angeles/project/res/layout/main.xml b/ndk/apps/san-angeles/project/res/layout/main.xml
deleted file mode 100644
index ca19a18..0000000
--- a/ndk/apps/san-angeles/project/res/layout/main.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-<TextView  
-    android:layout_width="match_parent" 
-    android:layout_height="wrap_content" 
-    android:text="Hello World, DemoActivity"
-    />
-</LinearLayout>
-
diff --git a/ndk/apps/san-angeles/project/res/values/strings.xml b/ndk/apps/san-angeles/project/res/values/strings.xml
deleted file mode 100644
index b01f0ee..0000000
--- a/ndk/apps/san-angeles/project/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">DemoActivity</string>
-</resources>
diff --git a/ndk/apps/san-angeles/project/src/com/example/SanAngeles/DemoActivity.java b/ndk/apps/san-angeles/project/src/com/example/SanAngeles/DemoActivity.java
deleted file mode 100644
index 696be78..0000000
--- a/ndk/apps/san-angeles/project/src/com/example/SanAngeles/DemoActivity.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * 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.
- *
- * This is a small port of the "San Angeles Observation" demo
- * program for OpenGL ES 1.x. For more details, see:
- *
- *    http://jet.ro/visuals/san-angeles-observation/
- *
- * This program demonstrates how to use a GLSurfaceView from Java
- * along with native OpenGL calls to perform frame rendering.
- *
- * Touching the screen will start/stop the animation.
- *
- * Note that the demo runs much faster on the emulator than on
- * real devices, this is mainly due to the following facts:
- *
- * - the demo sends bazillions of polygons to OpenGL without
- *   even trying to do culling. Most of them are clearly out
- *   of view.
- *
- * - on a real device, the GPU bus is the real bottleneck
- *   that prevent the demo from getting acceptable performance.
- *
- * - the software OpenGL engine used in the emulator uses
- *   the system bus instead, and its code rocks :-)
- *
- * Fixing the program to send less polygons to the GPU is left
- * as an exercise to the reader. As always, patches welcomed :-)
- */
-package com.example.SanAngeles;
-
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-
-import android.app.Activity;
-import android.content.Context;
-import android.opengl.GLSurfaceView;
-import android.os.Bundle;
-import android.view.MotionEvent;
-
-public class DemoActivity extends Activity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mGLView = new DemoGLSurfaceView(this);
-        setContentView(mGLView);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        mGLView.onPause();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mGLView.onResume();
-    }
-
-    private GLSurfaceView mGLView;
-
-    static {
-        System.loadLibrary("sanangeles");
-    }
-}
-
-class DemoGLSurfaceView extends GLSurfaceView {
-    public DemoGLSurfaceView(Context context) {
-        super(context);
-        mRenderer = new DemoRenderer();
-        setRenderer(mRenderer);
-    }
-
-    public boolean onTouchEvent(final MotionEvent event) {
-        if (event.getAction() == MotionEvent.ACTION_DOWN) {
-            nativePause();
-        }
-        return true;
-    }
-
-    DemoRenderer mRenderer;
-
-    private static native void nativePause();
-}
-
-class DemoRenderer implements GLSurfaceView.Renderer {
-    public void onSurfaceCreated(GL10 gl, EGLConfig config) {
-        nativeInit();
-    }
-
-    public void onSurfaceChanged(GL10 gl, int w, int h) {
-        //gl.glViewport(0, 0, w, h);
-        nativeResize(w, h);
-    }
-
-    public void onDrawFrame(GL10 gl) {
-        nativeRender();
-    }
-
-    private static native void nativeInit();
-    private static native void nativeResize(int w, int h);
-    private static native void nativeRender();
-    private static native void nativeDone();
-}
diff --git a/ndk/apps/two-libs/Application.mk b/ndk/apps/two-libs/Application.mk
deleted file mode 100644
index a2fd402..0000000
--- a/ndk/apps/two-libs/Application.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-APP_PROJECT_PATH := $(call my-dir)/project
-APP_MODULES      := twolib-first twolib-second
diff --git a/ndk/apps/two-libs/project/AndroidManifest.xml b/ndk/apps/two-libs/project/AndroidManifest.xml
deleted file mode 100644
index 8ed9917..0000000
--- a/ndk/apps/two-libs/project/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.example.twolibs"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="3" />
-    <application android:label="@string/app_name">
-        <activity android:name=".TwoLibs"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest> 
diff --git a/ndk/apps/two-libs/project/default.properties b/ndk/apps/two-libs/project/default.properties
deleted file mode 100644
index 4513a1e..0000000
--- a/ndk/apps/two-libs/project/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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 use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-3
diff --git a/ndk/apps/two-libs/project/jni/Android.mk b/ndk/apps/two-libs/project/jni/Android.mk
deleted file mode 100644
index eb3f018..0000000
--- a/ndk/apps/two-libs/project/jni/Android.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-
-# the purpose of this sample is to demonstrate how one can
-# generate two distinct shared libraries and have them both
-# uploaded in
-#
-
-LOCAL_PATH:= $(call my-dir)
-
-# first lib, which will be built statically
-#
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := libtwolib-first
-LOCAL_SRC_FILES := first.c
-
-include $(BUILD_STATIC_LIBRARY)
-
-# second lib, which will depend on and include the first one
-#
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := libtwolib-second
-LOCAL_SRC_FILES := second.c
-
-LOCAL_STATIC_LIBRARIES := libtwolib-first
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/ndk/apps/two-libs/project/jni/first.c b/ndk/apps/two-libs/project/jni/first.c
deleted file mode 100644
index f09e376..0000000
--- a/ndk/apps/two-libs/project/jni/first.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * 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 "first.h"
-
-int  first(int  x, int  y)
-{
-    return x + y;
-}
diff --git a/ndk/apps/two-libs/project/jni/first.h b/ndk/apps/two-libs/project/jni/first.h
deleted file mode 100644
index d893480..0000000
--- a/ndk/apps/two-libs/project/jni/first.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * 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 FIRST_H
-#define FIRST_H
-
-extern int first(int  x, int  y);
-
-#endif /* FIRST_H */
diff --git a/ndk/apps/two-libs/project/jni/second.c b/ndk/apps/two-libs/project/jni/second.c
deleted file mode 100644
index 4631848..0000000
--- a/ndk/apps/two-libs/project/jni/second.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * 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 "first.h"
-#include <jni.h>
-
-jint
-Java_com_example_twolibs_TwoLibs_add( JNIEnv*  env,
-                                      jobject  this,
-                                      jint     x,
-                                      jint     y )
-{
-    return first(x, y);
-}
diff --git a/ndk/apps/two-libs/project/res/values/strings.xml b/ndk/apps/two-libs/project/res/values/strings.xml
deleted file mode 100644
index ae57f1f..0000000
--- a/ndk/apps/two-libs/project/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">TwoLib</string>
-</resources>
diff --git a/ndk/apps/two-libs/project/src/com/example/twolibs/TwoLibs.java b/ndk/apps/two-libs/project/src/com/example/twolibs/TwoLibs.java
deleted file mode 100644
index ef9da01..0000000
--- a/ndk/apps/two-libs/project/src/com/example/twolibs/TwoLibs.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * 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.
- */
-package com.example.twolibs;
-
-import android.app.Activity;
-import android.widget.TextView;
-import android.os.Bundle;
-
-public class TwoLibs extends Activity
-{
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-
-        TextView  tv = new TextView(this);
-        int       x  = 1000;
-        int       y  = 42;
-
-        // here, we dynamically load the library at runtime
-        // before calling the native method.
-        //
-        System.loadLibrary("twolib-second");
-
-        int  z = add(x, y);
-
-        tv.setText( "The sum of " + x + " and " + y + " is " + z );
-        setContentView(tv);
-    }
-
-    public native int add(int  x, int  y);
-}
diff --git a/ndk/apps/two-libs/project/tests/AndroidManifest.xml b/ndk/apps/two-libs/project/tests/AndroidManifest.xml
deleted file mode 100644
index a7dd602..0000000
--- a/ndk/apps/two-libs/project/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.example.TwoLib.tests"
-          android:versionCode="1"
-          android:versionName="1.0">
-    <!-- We add an application tag here just so that we can indicate that
-         this package needs to link against the android.test library,
-         which is needed when building test cases. -->
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-    <!--
-    This declares that this application uses the instrumentation test runner targeting
-    the package of com.example.TwoLib.  To run the tests use the command:
-    "adb shell am instrument -w com.example.TwoLib.tests/android.test.InstrumentationTestRunner"
-    -->
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.example.TwoLib"
-                     android:label="Tests for TwoLib"/>
-</manifest>
diff --git a/ndk/apps/two-libs/project/tests/default.properties b/ndk/apps/two-libs/project/tests/default.properties
deleted file mode 100644
index 4513a1e..0000000
--- a/ndk/apps/two-libs/project/tests/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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 use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-3
diff --git a/ndk/apps/two-libs/project/tests/src/com/example/TwoLib/TwoLibTest.java b/ndk/apps/two-libs/project/tests/src/com/example/TwoLib/TwoLibTest.java
deleted file mode 100644
index 2924502..0000000
--- a/ndk/apps/two-libs/project/tests/src/com/example/TwoLib/TwoLibTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.example.TwoLib;
-
-import android.test.ActivityInstrumentationTestCase;
-
-/**
- * This is a simple framework for a test of an Application.  See
- * {@link android.test.ApplicationTestCase ApplicationTestCase} for more information on
- * how to write and extend Application tests.
- * <p/>
- * To run this test, you can type:
- * adb shell am instrument -w \
- * -e class com.example.TwoLib.TwoLibTest \
- * com.example.TwoLib.tests/android.test.InstrumentationTestRunner
- */
-public class TwoLibTest extends ActivityInstrumentationTestCase<TwoLib> {
-
-    public TwoLibTest() {
-        super("com.example.TwoLib", TwoLib.class);
-    }
-
-}
diff --git a/ndk/apps/unit-tests/Android.mk b/ndk/apps/unit-tests/Android.mk
deleted file mode 100644
index 5053e7d..0000000
--- a/ndk/apps/unit-tests/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/ndk/apps/unit-tests/Application.mk b/ndk/apps/unit-tests/Application.mk
deleted file mode 100644
index 8699134..0000000
--- a/ndk/apps/unit-tests/Application.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-APP_MODULES := \
-    test-LOCAL_CFLAGS \
-    test-LOCAL_CPPFLAGS
-
-APP_PROJECT_PATH := /tmp/ndk-unit-tests
-APP_BUILD_SCRIPT := $(call my-dir)/Android.mk
diff --git a/ndk/apps/unit-tests/test-CLEAR_VARS/Android.mk b/ndk/apps/unit-tests/test-CLEAR_VARS/Android.mk
deleted file mode 100644
index fde4e7b..0000000
--- a/ndk/apps/unit-tests/test-CLEAR_VARS/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# This test is used to check that include $(CLEAR_VARS) does
-# indeed clear all variables we care for.
-
-LOCAL_PATH := $(call my-dir)
-
-# The list of LOCAL_XXX variables documented by docs/ANDROID-MK.TXT
-# Note that LOCAL_PATH is not cleared
-VARS_LOCAL := \
-    MODULE \
-    SRC_FILES \
-    CPP_EXTENSION \
-    C_INCLUDES \
-    CFLAGS \
-    CPPFLAGS \
-    CXXFLAGS \
-    STATIC_LIBRARIES \
-    SHARED_LIBRARIES \
-    LDLIBS \
-    ALLOW_UNDEFINED_SYMBOLS \
-    ARM_MODE \
-
-include $(CLEAR_VARS)
-
-$(for _var,$(VARS_LOCAL),\
-  $(eval LOCAL_$(_var) := 1)\
-)
-
-include $(CLEAR_VARS)
-
-STATUS := ok
-$(foreach _var,$(VARS_LOCAL),\
-    $(if $(LOCAL_$(_var)),\
-      $(info variable LOCAL_$(_var) is not cleared by CLEAR_VARS)\
-      $(eval STATUS := ko)\
-    ,)\
-)
-
-ifeq ($(STATUS),ko)
-  $(error Aborting: CLEAR_VARS does not work !)
-endif
-
-VARS_LOCAL := $(empty)
-STATUS     := $(empty)
diff --git a/ndk/apps/unit-tests/test-LOCAL_CFLAGS/Android.mk b/ndk/apps/unit-tests/test-LOCAL_CFLAGS/Android.mk
deleted file mode 100644
index 25348d1..0000000
--- a/ndk/apps/unit-tests/test-LOCAL_CFLAGS/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Test that LOCAL_CFLAGS works for both C and C++ sources
-#
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := test-LOCAL_CFLAGS
-LOCAL_SRC_FILES := test-LOCAL_CFLAGS-1.c \
-                   test-LOCAL_CFLAGS-2.cpp \
-
-LOCAL_CFLAGS    := -DBANANA=100
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/ndk/apps/unit-tests/test-LOCAL_CFLAGS/test-LOCAL_CFLAGS-1.c b/ndk/apps/unit-tests/test-LOCAL_CFLAGS/test-LOCAL_CFLAGS-1.c
deleted file mode 100644
index c14a62c..0000000
--- a/ndk/apps/unit-tests/test-LOCAL_CFLAGS/test-LOCAL_CFLAGS-1.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#if !defined(BANANA)
-#  error LOCAL_CFLAGS does not work for C source file
-#endif
-#if BANANA != 100
-#  error LOCAL_CFLAGS does not work correctly for C source file
-#endif
-
-void  __banana_foo1(void)
-{
-}
diff --git a/ndk/apps/unit-tests/test-LOCAL_CFLAGS/test-LOCAL_CFLAGS-2.cpp b/ndk/apps/unit-tests/test-LOCAL_CFLAGS/test-LOCAL_CFLAGS-2.cpp
deleted file mode 100644
index 4b769c0..0000000
--- a/ndk/apps/unit-tests/test-LOCAL_CFLAGS/test-LOCAL_CFLAGS-2.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#if !defined(BANANA)
-#  error LOCAL_CFLAGS does not work for C++ source file
-#endif
-#if BANANA != 100
-#  error LOCAL_CFLAGS does not work correctly for C++ source file
-#endif
-
-void  __banana_foo2(void)
-{
-}
diff --git a/ndk/apps/unit-tests/test-LOCAL_CPPFLAGS/Android.mk b/ndk/apps/unit-tests/test-LOCAL_CPPFLAGS/Android.mk
deleted file mode 100644
index 45c9b6d..0000000
--- a/ndk/apps/unit-tests/test-LOCAL_CPPFLAGS/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Test that LOCAL_CPPFLAGS only works for C++ sources
-#
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := test-LOCAL_CPPFLAGS
-LOCAL_SRC_FILES := test-LOCAL_CPPFLAGS-1.c \
-                   test-LOCAL_CPPFLAGS-2.cpp \
-
-LOCAL_CFLAGS   := -DBANANA=200
-
-# Note, the -UBANANA is only there to prevent a warning
-# the test works well without it.
-LOCAL_CPPFLAGS := -UBANANA -DBANANA=300
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/ndk/apps/unit-tests/test-LOCAL_CPPFLAGS/test-LOCAL_CPPFLAGS-1.c b/ndk/apps/unit-tests/test-LOCAL_CPPFLAGS/test-LOCAL_CPPFLAGS-1.c
deleted file mode 100644
index c5f2a6e..0000000
--- a/ndk/apps/unit-tests/test-LOCAL_CPPFLAGS/test-LOCAL_CPPFLAGS-1.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#if !defined(BANANA)
-#  error LOCAL_CPPFLAGS does not work for C source file
-#endif
-#if BANANA != 200
-#  error LOCAL_CPPFLAGS does not work correctly for C source file
-#endif
-
-void  __banana_foo1(void)
-{
-}
diff --git a/ndk/apps/unit-tests/test-LOCAL_CPPFLAGS/test-LOCAL_CPPFLAGS-2.cpp b/ndk/apps/unit-tests/test-LOCAL_CPPFLAGS/test-LOCAL_CPPFLAGS-2.cpp
deleted file mode 100644
index e8853e8..0000000
--- a/ndk/apps/unit-tests/test-LOCAL_CPPFLAGS/test-LOCAL_CPPFLAGS-2.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#if !defined(BANANA)
-#  error LOCAL_CPPFLAGS does not work for C++ source file
-#endif
-#if BANANA != 300
-#  error LOCAL_CPPFLAGS does not work correctly for C++ source file
-#endif
-
-void  __banana_foo2(void)
-{
-}
diff --git a/ndk/build/check-awk.awk b/ndk/build/check-awk.awk
deleted file mode 100644
index 1e09317..0000000
--- a/ndk/build/check-awk.awk
+++ /dev/null
@@ -1,25 +0,0 @@
-# This script is used to check that a given awk executable
-# implements the match() and substr() functions appropriately.
-#
-# These were introduced in nawk/gawk, but the original awk
-# does not have them.
-#
-END {
-    RSTART=0
-    RLENGTH=0
-    s1="A real world example"
-    if (! match(s1,"world")) {
-        print "Fail match"
-    } else if (RSTART != 8) {
-        print "Fail RSTART ="RSTART
-    } else if (RLENGTH != 5) {
-        print "Fail RLENGTH ="RLENGTH
-    } else {
-        s2=substr(s1,RSTART,RLENGTH)
-        if (s2 != "world") {
-            print "Fail substr="s2
-        } else {
-            print "Pass"
-        }
-    }
-}
diff --git a/ndk/build/core/add-application.mk b/ndk/build/core/add-application.mk
deleted file mode 100644
index 3505d1f..0000000
--- a/ndk/build/core/add-application.mk
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-
-# this script is used to record an application definition in the
-# NDK build system, before performing any build whatsoever.
-#
-# It is included repeatedly from build/core/main.mk and expects a
-# variable named '_application_mk' which points to a given Application.mk
-# file that will be included here. The latter must define a few variables
-# to describe the application to the build system, and the rest of the
-# code here will perform book-keeping and basic checks
-#
-
-$(call assert-defined, _application_mk)
-$(call ndk_log,Parsing $(_application_mk))
-
-$(call clear-vars, $(NDK_APP_VARS))
-
-include $(_application_mk)
-
-$(call check-required-vars,$(NDK_APP_VARS_REQUIRED),$(_application_mk))
-
-_dir  := $(patsubst %/,%,$(dir $(_application_mk)))
-_name := $(notdir $(_dir))
-_map  := NDK_APP.$(_name)
-
-# strip the 'lib' prefix in front of APP_MODULES modules
-APP_MODULES := $(call strip-lib-prefix,$(APP_MODULES))
-
-# check that APP_OPTIM, if defined, is either 'release' or 'debug'
-APP_OPTIM := $(strip $(APP_OPTIM))
-$(if $(filter-out release debug,$(APP_OPTIM)),\
-  $(call __ndk_info, The APP_OPTIM defined in $(_application_mk) must only be 'release' or 'debug')\
-  $(call __ndk_error,Aborting)\
-)
-
-ifndef APP_OPTIM
-    $(call ndk_log,  Defaulted to APP_OPTIM=release)
-    APP_OPTIM := release
-endif
-
-# check whether APP_PLATFORM is defined. If not, look for default.properties in
-# the $(APP_PROJECT_PATH) and extract the value with awk's help. If nothing is here,
-# revert to the default value (i.e. "android-3").
-#
-# NOTE: APP_PLATFORM is an experimental feature for now.
-#
-APP_PLATFORM := $(strip $(APP_PLATFORM))
-ifndef APP_PLATFORM
-    _local_props := $(strip $(wildcard $(APP_PROJECT_PATH)/default.properties))
-    ifdef _local_props
-        APP_PLATFORM := $(strip $(shell $(HOST_AWK) -f $(BUILD_SYSTEM)/extract-platform.awk < $(_local_props)))
-        $(call ndk_log,  Found APP_PLATFORM=$(APP_PLATFORM) in $(_local_props))
-    else
-        APP_PLATFORM := android-3
-        $(call ndk_log,  Defaulted to APP_PLATFORM=$(APP_PLATFORM))
-    endif
-endif
-
-# Check that the value of APP_PLATFORM corresponds to a known platform
-# If not, we're going to use the max supported platform value.
-#
-_bad_platform := $(strip $(filter-out $(NDK_ALL_PLATFORMS),$(APP_PLATFORM)))
-ifdef _bad_platform
-    $(call __ndk_info,Application $(_name) targets unknown platform '$(_bad_platform)')
-    APP_PLATFORM := android-$(NDK_MAX_PLATFORM_LEVEL)
-    $(call __ndk_info,Switching to $(APP_PLATFORM))
-endif
-
-# If APP_BUILD_SCRIPT is defined, check that the file exists.
-# If undefined, look in $(APP_PROJECT_PATH)/jni/Android.mk
-#
-APP_BUILD_SCRIPT := $(strip $(APP_BUILD_SCRIPT))
-ifdef APP_BUILD_SCRIPT
-    _build_script := $(strip $(wildcard $(APP_BUILD_SCRIPT)))
-    ifndef _build_script
-        $(call __ndk_info,Your APP_BUILD_SCRIPT points to an unknown file: $(APP_BUILD_SCRIPT))
-        $(call __ndk_error,Aborting...)
-    endif
-    APP_BUILD_SCRIPT := $(_build_script)
-    $(call ndk_log,  Using build script $(APP_BUILD_SCRIPT))
-else
-    _build_script := $(strip $(wildcard $(APP_PROJECT_PATH)/jni/Android.mk))
-    ifndef _build_script
-        $(call __ndk_info,There is no Android.mk under $(APP_PROJECT_PATH)/jni)
-        $(call __ndk_info,If this is intentional, please define APP_BUILD_SCRIPT to point)
-        $(call __ndk_info,to a valid NDK build script.)
-        $(call __ndk_error,Aborting...)
-    endif
-    APP_BUILD_SCRIPT := $(_build_script)
-    $(call ndk_log,  Defaulted to APP_BUILD_SCRIPT=$(APP_BUILD_SCRIPT))
-endif
-
-$(if $(call get,$(_map),defined),\
-  $(call __ndk_info,Weird, the application $(_name) is already defined by $(call get,$(_map),defined))\
-  $(call __ndk_error,Aborting)\
-)
-
-$(call set,$(_map),defined,$(_application_mk))
-
-# Record all app-specific variable definitions
-$(foreach __name,$(NDK_APP_VARS),\
-  $(call set,$(_map),$(__name),$($(__name)))\
-)
-
-# Record the Application.mk for debugging
-$(call set,$(_map),Application.mk,$(_application_mk))
-
-NDK_ALL_APPS += $(_name)
diff --git a/ndk/build/core/add-platform.mk b/ndk/build/core/add-platform.mk
deleted file mode 100644
index da83717..0000000
--- a/ndk/build/core/add-platform.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-
-$(call assert-defined,_platform NDK_PLATFORMS_ROOT)
-
-# For each platform, determine the corresponding supported ABIs
-# And record them in NDK_PLATFORM_$(platform)_ABIS
-#
-_abis := $(strip $(notdir $(wildcard $(NDK_PLATFORMS_ROOT)/$(_platform)/arch-*)))
-_abis := $(_abis:arch-%=%)
-
-$(call ndk_log,PLATFORM $(_platform) supports: $(_abis))
-
-NDK_PLATFORM_$(_platform)_ABIS    := $(_abis)
-
-# Record the sysroots for each supported ABI
-#
-$(foreach _abi,$(_abis),\
-  $(eval NDK_PLATFORM_$(_platform)_$(_abi)_SYSROOT := $(NDK_PLATFORMS_ROOT)/$(_platform)/arch-$(_abi))\
-  $(call ndk_log,  ABI $(_abi) sysroot is: $(NDK_PLATFORM_$(_platform)_$(_abi)_SYSROOT))\
-)
diff --git a/ndk/build/core/add-toolchain.mk b/ndk/build/core/add-toolchain.mk
deleted file mode 100644
index 498d624..0000000
--- a/ndk/build/core/add-toolchain.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-
-# this script is included repeatedly by main.mk to add a new toolchain
-# definition to the NDK build system.
-#
-# 'toolchain_config' must be defined as the path of a toolchain
-# configuration file (config.mk) that will be included here.
-#
-$(call assert-defined, _config_mk)
-
-# The list of variables that must or may be defined
-# by the toolchain configuration file
-#
-NDK_TOOLCHAIN_VARS_REQUIRED := TOOLCHAIN_ABIS
-NDK_TOOLCHAIN_VARS_OPTIONAL :=
-
-# Clear variables that are supposed to be defined by the config file
-$(call clear-vars,$(NDK_TOOLCHAIN_VARS_REQUIRED))
-$(call clear-vars,$(NDK_TOOLCHAIN_VARS_OPTIONAL))
-
-# Include the config file
-include $(_config_mk)
-
-# Check that the proper variables were defined
-$(call check-required-vars,$(NDK_TOOLCHAIN_VARS_REQUIRED),$(_config_mk))
-
-# Check that the file didn't do something stupid
-$(call assert-defined, _config_mk)
-
-# Now record the toolchain-specific informatio
-_dir  := $(patsubst %/,%,$(dir $(_config_mk)))
-_name := $(notdir $(_dir))
-_abis := $(TOOLCHAIN_ABIS)
-
-_toolchain := NDK_TOOLCHAIN.$(_name)
-
-# check that the toolchain name is unique
-$(if $(strip $($(_toolchain).defined)),\
-  $(call __ndk_error,Toolchain $(_name) defined in $(_parent) is\
-                     already defined in $(NDK_TOOLCHAIN.$(_name).defined)))
-
-$(_toolchain).defined := $(_toolchain_config)
-$(_toolchain).abis    := $(_abis)
-$(_toolchain).setup   := $(wildcard $(_dir)/setup.mk)
-
-$(if $(strip $($(_toolchain).setup)),,\
-  $(call __ndk_error, Toolchain $(_name) lacks a setup.mk in $(_dir)))
-
-NDK_ALL_TOOLCHAINS += $(_name)
-NDK_ALL_ABIS       += $(_abis)
-
-# done
diff --git a/ndk/build/core/build-binary.mk b/ndk/build/core/build-binary.mk
deleted file mode 100644
index eafa5e0..0000000
--- a/ndk/build/core/build-binary.mk
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# 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.
-#
-
-# we expect the 'my' variable to be defined, either to
-# 'HOST_' or 'TARGET_', and this allows us to call the
-# appropriate compiler with $($(my)CC)
-#
-$(call assert-defined,my)
-
-# LOCAL_MAKEFILE must also exist and name the Android.mk that
-# included the module build script.
-#
-$(call assert-defined,LOCAL_MAKEFILE)
-
-include $(BUILD_SYSTEM)/build-module.mk
-
-# list of generated object files
-LOCAL_OBJECTS :=
-
-# always define ANDROID when building binaries
-#
-LOCAL_CFLAGS := -DANDROID $(LOCAL_CFLAGS)
-
-#
-# Add the default system shared libraries to the build
-#
-ifndef LOCAL_IS_HOST_MODULE
-  ifeq ($(LOCAL_SYSTEM_SHARED_LIBRARIES),none)
-    LOCAL_SHARED_LIBRARIES += $(TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES)
-  else
-    LOCAL_SHARED_LIBRARIES += $(LOCAL_SYSTEM_SHARED_LIBRARIES)
-  endif
-endif
-
-
-#
-# Check LOCAL_CPP_EXTENSION, use '.cpp' by default
-#
-LOCAL_CPP_EXTENSION := $(strip $(LOCAL_CPP_EXTENSION))
-ifeq ($(LOCAL_CPP_EXTENSION),)
-  LOCAL_CPP_EXTENSION := .cpp
-else
-  ifneq ($(words $(LOCAL_CPP_EXTENSION)),1)
-    $(call __ndk_info, LOCAL_CPP_EXTENSION in $(LOCAL_MAKEFILE) must be one word only, not '$(LOCAL_CPP_EXTENSION)')
-    $(call __ndk_error, Aborting)
-  endif
-endif
-
-#
-# If LOCAL_ALLOW_UNDEFINED_SYMBOLS is not true, the linker will allow the generation
-# of a binary that uses undefined symbols.
-#
-ifneq ($(LOCAL_ALLOW_UNDEFINED_SYMBOLS),true)
-  LOCAL_LDFLAGS := $(LOCAL_LDFLAGS) $($(my)NO_UNDEFINED_LDFLAGS)
-endif
-
-#
-# The original Android build system allows you to use the .arm prefix
-# to a source file name to indicate that it should be defined in either
-# 'thumb' or 'arm' mode, depending on the value of LOCAL_ARM_MODE
-#
-# First, check LOCAL_ARM_MODE, it should be empty, 'thumb' or 'arm'
-# We make the default 'thumb'
-#
-LOCAL_ARM_MODE := $(strip $(LOCAL_ARM_MODE))
-ifdef LOCAL_ARM_MODE
-  ifneq ($(words $(LOCAL_ARM_MODE)),1)
-      $(call __ndk_info,   LOCAL_ARM_MODE in $(LOCAL_MAKEFILE) must be one word, not '$(LOCAL_ARM_MODE)')
-      $(call __ndk_error, Aborting)
-  endif
-  # check that LOCAL_ARM_MODE is defined to either 'arm' or 'thumb'
-  $(if $(filter-out thumb arm, $(LOCAL_ARM_MODE)),\
-      $(call __ndk_info,   LOCAL_ARM_MODE must be defined to either 'arm' or 'thumb' in $(LOCAL_MAKEFILE) not '$(LOCAL_ARM_MODE)')\
-      $(call __ndk_error, Aborting)\
-  )
-endif
-
-# As a special case, the original Android build system
-# allows one to specify that certain source files can be
-# forced to build in ARM mode by using a '.arm' suffix
-# after the extension, e.g.
-#
-#  LOCAL_SRC_FILES := foo.c.arm
-#
-# to build source file $(LOCAL_PATH)/foo.c as ARM
-#
-
-# As a special extension, the NDK also supports the .neon extension suffix
-# to indicate that a single file can be compiled with ARM NEON support
-# We must support both foo.c.neon and foo.c.arm.neon here
-#
-# Also, if LOCAL_ARM_NEON is set to 'true', force Neon mode for all source
-# files
-#
-
-neon_sources  := $(filter %.neon,$(LOCAL_SRC_FILES))
-neon_sources  := $(neon_sources:%.neon=%)
-
-LOCAL_ARM_NEON := $(strip $(LOCAL_ARM_NEON))
-ifdef LOCAL_ARM_NEON
-  $(if $(filter-out true false,$(LOCAL_ARM_NEON)),\
-    $(call __ndk_info,LOCAL_ARM_NEON must be defined either to 'true' or 'false' in $(LOCAL_MAKEFILE), not '$(LOCAL_ARM_NEON)')\
-    $(call __ndk_error,Aborting) \
-  )
-endif
-ifeq ($(LOCAL_ARM_NEON),true)
-  neon_sources += $(LOCAL_SRC_FILES:%.neon=%))
-endif
-
-neon_sources := $(strip $(neon_sources))
-ifdef neon_sources
-  ifneq ($(TARGET_ARCH_ABI),armeabi-v7a)
-    $(call __ndk_info,NEON support is only possible for armeabi-v7a ABI)
-    $(call __ndk_info,Please add checks afainst TARGET_ARCH_ABI in $(LOCAL_MAKEFILE))
-    $(call __ndk_error,Aborting)
-  endif
-  $(call tag-src-files,$(neon_sources:%.arm=%),neon)
-endif
-
-LOCAL_SRC_FILES := $(LOCAL_SRC_FILES:%.neon=%)
-
-# strip the .arm suffix from LOCAL_SRC_FILES
-# and tag the relevant sources with the 'arm' tag
-#
-arm_sources     := $(filter %.arm,$(LOCAL_SRC_FILES))
-arm_sources     := $(arm_sources:%.arm=%)
-thumb_sources   := $(filter-out %.arm,$(LOCAL_SRC_FILES))
-LOCAL_SRC_FILES := $(arm_sources) $(thumb_sources)
-
-ifeq ($(LOCAL_ARM_MODE),arm)
-    arm_sources := $(LOCAL_SRC_FILES)
-endif
-ifeq ($(LOCAL_ARM_MODE),thumb)
-    arm_sources := $(empty)
-endif
-$(call tag-src-files,$(arm_sources),arm)
-
-# Process all source file tags to determine toolchain-specific
-# target compiler flags, and text.
-#
-$(call TARGET-process-src-files-tags)
-
-# only call dump-src-file-tags during debugging
-#$(dump-src-file-tags)
-
-# Build the sources to object files
-#
-$(foreach src,$(filter %.c,$(LOCAL_SRC_FILES)), $(call compile-c-source,$(src)))
-$(foreach src,$(filter %.S,$(LOCAL_SRC_FILES)), $(call compile-s-source,$(src)))
-
-$(foreach src,$(filter %$(LOCAL_CPP_EXTENSION),$(LOCAL_SRC_FILES)),\
-    $(call compile-cpp-source,$(src)))
-
-#
-# The compile-xxx-source calls updated LOCAL_OBJECTS and LOCAL_DEPENDENCY_DIRS
-#
-ALL_DEPENDENCY_DIRS += $(sort $(LOCAL_DEPENDENCY_DIRS))
-CLEAN_OBJS_DIRS     += $(LOCAL_OBJS_DIR)
-
-#
-# Handle the static and shared libraries this module depends on
-#
-LOCAL_STATIC_LIBRARIES := $(call strip-lib-prefix,$(LOCAL_STATIC_LIBRARIES))
-LOCAL_SHARED_LIBRARIES := $(call strip-lib-prefix,$(LOCAL_SHARED_LIBRARIES))
-
-static_libraries := $(call map,static-library-path,$(LOCAL_STATIC_LIBRARIES))
-shared_libraries := $(call map,shared-library-path,$(LOCAL_SHARED_LIBRARIES)) \
-                    $(TARGET_PREBUILT_SHARED_LIBRARIES)
-
-$(LOCAL_BUILT_MODULE): $(static_libraries) $(shared_libraries)
-
-# If LOCAL_LDLIBS contains anything like -l<library> then
-# prepend a -L$(SYSROOT)/usr/lib to it to ensure that the linker
-# looks in the right location
-#
-ifneq ($(filter -l%,$(LOCAL_LDLIBS)),)
-    LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib $(LOCAL_LDLIBS)
-endif
-
-$(LOCAL_BUILT_MODULE): PRIVATE_STATIC_LIBRARIES := $(static_libraries)
-$(LOCAL_BUILT_MODULE): PRIVATE_SHARED_LIBRARIES := $(shared_libraries)
-$(LOCAL_BUILT_MODULE): PRIVATE_OBJECTS          := $(LOCAL_OBJECTS)
-
-$(LOCAL_BUILT_MODULE): PRIVATE_LDFLAGS := $(TARGET_LDFLAGS) $(LOCAL_LDFLAGS)
-$(LOCAL_BUILT_MODULE): PRIVATE_LDLIBS  := $(LOCAL_LDLIBS) $(TARGET_LDLIBS)
-
-$(LOCAL_BUILT_MODULE): PRIVATE_NAME := $(notdir $(LOCAL_BUILT_MODULE))
diff --git a/ndk/build/core/build-executable.mk b/ndk/build/core/build-executable.mk
deleted file mode 100644
index 6015e5f..0000000
--- a/ndk/build/core/build-executable.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-
-# this file is included from Android.mk files to build a target-specific
-# executable program
-#
-
-LOCAL_BUILD_SCRIPT := BUILD_EXECUTABLE
-LOCAL_MODULE_CLASS := EXECUTABLE
-LOCAL_MAKEFILE     := $(local-makefile)
-
-$(call check-defined-LOCAL_MODULE,$(LOCAL_BUILD_SCRIPT))
-$(call check-LOCAL_MODULE,$(LOCAL_MAKEFILE))
-
-# only adjust the build if this module is needed by the current app
-ifneq ($(filter $(LOCAL_MODULE),$(NDK_APP_MODULES)),)
-
-# we are building target objects
-my := TARGET_
-
-LOCAL_BUILT_MODULE := $(call executable-path,$(LOCAL_MODULE))
-LOCAL_OBJS_DIR     := $(TARGET_OBJS)/$(LOCAL_MODULE)
-
-include $(BUILD_SYSTEM)/build-binary.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_OBJECTS)
-	@ mkdir -p $(dir $@)
-	@ echo "Executable     : $(PRIVATE_NAME)"
-	$(hide) $(cmd-build-executable)
-
-ALL_EXECUTABLES += $(LOCAL_BUILT_MODULE)
-
-include $(BUILD_SYSTEM)/install-binary.mk
-
-endif # filter LOCAL_MODULE in NDK_APP_MODULES
diff --git a/ndk/build/core/build-module.mk b/ndk/build/core/build-module.mk
deleted file mode 100644
index 67a29e0..0000000
--- a/ndk/build/core/build-module.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# 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.
-#
-
-#
-# Base rules shared to control the build of all modules.
-# This should be included from build-binary.mk
-#
-
-$(call assert-defined,LOCAL_MODULE_CLASS LOCAL_BUILD_SCRIPT LOCAL_BUILT_MODULE)
-
-# Check LOCAL_IS_HOST_MODULE and define 'my' as either HOST_ or TARGET_
-#
-LOCAL_IS_HOST_MODULE := $(strip $(LOCAL_IS_HOST_MODULE))
-ifdef LOCAL_IS_HOST_MODULE
-  ifneq ($(LOCAL_IS_HOST_MODULE),true)
-    $(call __ndk_log,$(LOCAL_PATH): LOCAL_IS_HOST_MODULE must be "true" or empty, not "$(LOCAL_IS_HOST_MODULE)")
-  endif
-  my := HOST_
-else
-  my := TARGET_
-endif
-
-# Compute 'intermediates' which is the location where we're going to store
-# intermediate generated files like object (.o) files.
-#
-intermediates := $($(my)OBJS)
-
-# LOCAL_INTERMEDIATES lists the targets that are generated by this module
-#
-LOCAL_INTERMEDIATES := $(LOCAL_BUILT_MODULE)
-
-# LOCAL_BUILD_MODE will be either release or debug
-#
-ifneq ($(NDK_APP_OPTIM),)
-    LOCAL_BUILD_MODE := $(NDK_APP_OPTIM)
-else
-    LOCAL_BUILD_MODE := release
-endif
-
-#
-# Ensure that 'make <module>' and 'make clean-<module>' work
-#
-.PHONY: $(LOCAL_MODULE)
-$(LOCAL_MODULE): $(LOCAL_BUILT_MODULE)
-
-cleantarget := clean-$(LOCAL_MODULE)
-.PHONY: $(cleantarget)
-clean: $(cleantarget)
-
-$(cleantarget): PRIVATE_MODULE      := $(LOCAL_MODULE)
-$(cleantarget): PRIVATE_CLEAN_FILES := $(PRIVATE_CLEAN_FILES) \
-                                       $(LOCAL_BUILT_MODULE) \
-                                       $(LOCAL_INSTALLED_MODULE) \
-                                       $(intermediates)
-
-$(cleantarget)::
-	@echo "Clean: $(PRIVATE_MODULE)"
-	$(hide) rm -rf $(PRIVATE_CLEAN_FILES)
-
-#
-# Register module
-#
-
-ALL_MODULES += $(LOCAL_MODULE)
-
-
diff --git a/ndk/build/core/build-shared-library.mk b/ndk/build/core/build-shared-library.mk
deleted file mode 100644
index 27ac0a7..0000000
--- a/ndk/build/core/build-shared-library.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-
-# this file is included from Android.mk files to build a target-specific
-# shared library
-#
-
-LOCAL_BUILD_SCRIPT := BUILD_SHARED_LIBRARY
-LOCAL_MODULE_CLASS := SHARED_LIBRARY
-LOCAL_MAKEFILE     := $(local-makefile)
-
-$(call check-defined-LOCAL_MODULE,$(LOCAL_BUILD_SCRIPT))
-$(call check-LOCAL_MODULE,$(LOCAL_MAKEFILE))
-
-# only adjust the build if this module is needed by the current app
-ifneq ($(filter $(LOCAL_MODULE),$(NDK_APP_MODULES)),)
-
-# we are building target objects
-my := TARGET_
-
-LOCAL_BUILT_MODULE := $(call shared-library-path,$(LOCAL_MODULE))
-LOCAL_OBJS_DIR     := $(TARGET_OBJS)/$(LOCAL_MODULE)
-
-include $(BUILD_SYSTEM)/build-binary.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_OBJECTS)
-	@ mkdir -p $(dir $@)
-	@ echo "SharedLibrary  : $(PRIVATE_NAME)"
-	$(hide) $(cmd-build-shared-library)
-
-ALL_SHARED_LIBRARIES += $(LOCAL_BUILT_MODULE)
-
-include $(BUILD_SYSTEM)/install-binary.mk
-
-endif # filter LOCAL_MODULE in NDK_APP_MODULES
diff --git a/ndk/build/core/build-static-library.mk b/ndk/build/core/build-static-library.mk
deleted file mode 100644
index 3de6d5f..0000000
--- a/ndk/build/core/build-static-library.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-
-# this file is included from Android.mk files to build a target-specific
-# static library
-#
-
-LOCAL_BUILD_SCRIPT := BUILD_STATIC_LIBRARY
-LOCAL_MODULE_CLASS := STATIC_LIBRARY
-LOCAL_MAKEFILE     := $(local-makefile)
-
-$(call check-defined-LOCAL_MODULE,$(LOCAL_BUILD_SCRIPT))
-$(call check-LOCAL_MODULE,$(LOCAL_MAKEFILE))
-
-# only adjust the build if this module is needed by the current app
-ifneq ($(filter $(LOCAL_MODULE),$(NDK_APP_MODULES)),)
-
-# we are building target objects
-my := TARGET_
-
-LOCAL_BUILT_MODULE := $(call static-library-path,$(LOCAL_MODULE))
-LOCAL_OBJS_DIR     := $(TARGET_OBJS)/$(LOCAL_MODULE)
-
-include $(BUILD_SYSTEM)/build-binary.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_OBJECTS)
-	@ mkdir -p $(dir $@)
-	@ echo "StaticLibrary  : $(PRIVATE_NAME)"
-	$(hide) rm -rf $@
-	$(hide) $(cmd-build-static-library)
-
-ALL_STATIC_LIBRARIES += $(LOCAL_BUILT_MODULE)
-
-endif # filter LOCAL_MODULE in NDK_APP_MODULES
diff --git a/ndk/build/core/clear-vars.mk b/ndk/build/core/clear-vars.mk
deleted file mode 100644
index c793cfb..0000000
--- a/ndk/build/core/clear-vars.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-
-# this file is included repeatedly from Android.mk files in order to clean
-# the module-specific variables from the environment,
-
-NDK_LOCAL_VARS := \
-  LOCAL_MODULE \
-  LOCAL_SRC_FILES \
-  LOCAL_C_INCLUDES \
-  LOCAL_CFLAGS \
-  LOCAL_CXXFLAGS \
-  LOCAL_CPPFLAGS \
-  LOCAL_LDFLAGS \
-  LOCAL_LDLIBS \
-  LOCAL_ARFLAGS \
-  LOCAL_CPP_EXTENSION \
-  LOCAL_STATIC_LIBRARIES \
-  LOCAL_STATIC_WHOLE_LIBRARIES \
-  LOCAL_SHARED_LIBRARIES \
-  LOCAL_MAKEFILE \
-  LOCAL_ALLOW_UNDEFINED_SYMBOLS \
-  LOCAL_ARM_MODE \
-  LOCAL_ARM_NEON \
-
-$(call clear-src-tags)
-$(call clear-vars, $(NDK_LOCAL_VARS))
-
diff --git a/ndk/build/core/definitions.mk b/ndk/build/core/definitions.mk
deleted file mode 100644
index db1837d..0000000
--- a/ndk/build/core/definitions.mk
+++ /dev/null
@@ -1,636 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-# Common definitions for the Android NDK build system
-#
-
-# We use the GNU Make Standard Library
-include $(BUILD_SYSTEM)/../gmsl/gmsl
-
-# This is the Android NDK version number as a list of three items:
-# major, minor, revision
-#
-ndk_version := 1 0 0
-
-# Used to output warnings and error from the library, it's possible to
-# disable any warnings or errors by overriding these definitions
-# manually or by setting GMSL_NO_WARNINGS or GMSL_NO_ERRORS
-
-__ndk_name    := Android NDK
-__ndk_info     = $(info $(__ndk_name): $1 $2 $3 $4 $5)
-__ndk_warning  = $(warning $(__ndk_name): $1 $2 $3 $4 $5)
-__ndk_error    = $(error $(__ndk_name): $1 $2 $3 $4 $5)
-
-ifdef NDK_NO_WARNINGS
-__ndk_warning :=
-endif
-ifdef NDK_NO_ERRORS
-__ndk_error :=
-endif
-
-# If NDK_TRACE is enabled then calls to the library functions are
-# traced to stdout using warning messages with their arguments
-
-ifdef NDK_TRACE
-__ndk_tr1 = $(warning $0('$1'))
-__ndk_tr2 = $(warning $0('$1','$2'))
-__ndk_tr3 = $(warning $0('$1','$2','$3'))
-else
-__ndk_tr1 :=
-__ndk_tr2 :=
-__ndk_tr3 :=
-endif
-
-# -----------------------------------------------------------------------------
-# Function : ndk_log
-# Arguments: 1: text to print when NDK_LOG is defined
-# Returns  : None
-# Usage    : $(call ndk_log,<some text>)
-# -----------------------------------------------------------------------------
-ifdef NDK_LOG
-ndk_log = $(info $(__ndk_name): $1)
-else
-ndk_log :=
-endif
-
-
-# -----------------------------------------------------------------------------
-# Macro    : empty
-# Returns  : an empty macro
-# Usage    : $(empty)
-# -----------------------------------------------------------------------------
-empty :=
-
-# -----------------------------------------------------------------------------
-# Macro    : space
-# Returns  : a single space
-# Usage    : $(space)
-# -----------------------------------------------------------------------------
-space  := $(empty) $(empty)
-
-# -----------------------------------------------------------------------------
-# Function : last2
-# Arguments: a list
-# Returns  : the penultimate (next-to-last) element of a list
-# Usage    : $(call last2, <LIST>)
-# -----------------------------------------------------------------------------
-last2 = $(word $(words $1), x $1)
-
-# -----------------------------------------------------------------------------
-# Function : last3
-# Arguments: a list
-# Returns  : the antepenultimate (second-next-to-last) element of a list
-# Usage    : $(call last3, <LIST>)
-# -----------------------------------------------------------------------------
-last3 = $(word $(words $1), x x $1)
-
-# -----------------------------------------------------------------------------
-# Macro    : this-makefile
-# Returns  : the name of the current Makefile in the inclusion stack
-# Usage    : $(this-makefile)
-# -----------------------------------------------------------------------------
-this-makefile = $(lastword $(MAKEFILE_LIST))
-
-# -----------------------------------------------------------------------------
-# Macro    : local-makefile
-# Returns  : the name of the last parsed Android.mk file
-# Usage    : $(local-makefile)
-# -----------------------------------------------------------------------------
-local-makefile = $(lastword $(filter %Android.mk,$(MAKEFILE_LIST)))
-
-# -----------------------------------------------------------------------------
-# Function : assert-defined
-# Arguments: 1: list of variable names
-# Returns  : None
-# Usage    : $(call assert-defined, VAR1 VAR2 VAR3...)
-# Rationale: Checks that all variables listed in $1 are defined, or abort the
-#            build
-# -----------------------------------------------------------------------------
-assert-defined = $(foreach __varname,$(strip $1),\
-  $(if $(strip $($(__varname))),,\
-    $(call __ndk_error, Assertion failure: $(__varname) is not defined)\
-  )\
-)
-
-# -----------------------------------------------------------------------------
-# Function : clear-vars
-# Arguments: 1: list of variable names
-#            2: file where the variable should be defined
-# Returns  : None
-# Usage    : $(call clear-vars, VAR1 VAR2 VAR3...)
-# Rationale: Clears/undefines all variables in argument list
-# -----------------------------------------------------------------------------
-clear-vars = $(foreach __varname,$1,$(eval $(__varname) := $(empty)))
-
-# -----------------------------------------------------------------------------
-# Function : check-required-vars
-# Arguments: 1: list of variable names
-#            2: file where the variable(s) should be defined
-# Returns  : None
-# Usage    : $(call check-required-vars, VAR1 VAR2 VAR3..., <file>)
-# Rationale: Checks that all required vars listed in $1 were defined by $2
-#            or abort the build with an error
-# -----------------------------------------------------------------------------
-check-required-vars = $(foreach __varname,$1,\
-  $(if $(strip $($(__varname))),,\
-    $(call __ndk_info, Required variable $(__varname) is not defined by $2)\
-    $(call __ndk_error,Aborting)\
-  )\
-)
-
-# -----------------------------------------------------------------------------
-# Function : modules-clear
-# Arguments: None
-# Returns  : None
-# Usage    : $(call modules-clear)
-# Rationale: clears the list of defined modules known by the build system
-# -----------------------------------------------------------------------------
-modules-clear = $(eval __ndk_modules := $(empty_set))
-
-# -----------------------------------------------------------------------------
-# Function : modules-add
-# Arguments: 1: module name
-#            2: path to Android.mk where the module is defined
-# Returns  : None
-# Usage    : $(call modules-add,<modulename>,<Android.mk path>)
-# Rationale: add a new module. If it is already defined, print an error message
-#            and abort.
-# -----------------------------------------------------------------------------
-modules-add = \
-  $(if $(call set_is_member,$(__ndk_modules),$1),\
-       $(call __ndk_info,Trying to define local module '$1' in $2.)\
-       $(call __ndk_info,But this module was already defined by $(__ndk_modules.$1).)\
-       $(call __ndk_error,Aborting.)\
-  )\
-  $(eval __ndk_modules := $(call set_insert,$(__ndk_modules),$1))\
-  $(eval __ndk_modules.$1 := $2)\
-
-# -----------------------------------------------------------------------------
-# Function : check-user-define
-# Arguments: 1: name of variable that must be defined by the user
-#            2: name of Makefile where the variable should be defined
-#            3: name/description of the Makefile where the check is done, which
-#               must be included by $2
-# Returns  : None
-# -----------------------------------------------------------------------------
-check-user-define = $(if $(strip $($1)),,\
-  $(call __ndk_error,Missing $1 before including $3 in $2))
-
-# -----------------------------------------------------------------------------
-# This is used to check that LOCAL_MODULE is properly defined by an Android.mk
-# file before including one of the $(BUILD_SHARED_LIBRARY), etc... files.
-#
-# Function : check-user-LOCAL_MODULE
-# Arguments: 1: name/description of the included build Makefile where the
-#               check is done
-# Returns  : None
-# Usage    : $(call check-user-LOCAL_MODULE, BUILD_SHARED_LIBRARY)
-# -----------------------------------------------------------------------------
-check-defined-LOCAL_MODULE = \
-  $(call check-user-define,LOCAL_MODULE,$(local-makefile),$(1)) \
-  $(if $(call seq,$(words $(LOCAL_MODULE)),1),,\
-    $(call __ndk_info,LOCAL_MODULE definition in $(local-makefile) must not contain space)\
-    $(call __ndk_error,Please correct error. Aborting)\
-  )
-
-# -----------------------------------------------------------------------------
-# Strip any 'lib' prefix in front of a given string.
-#
-# Function : strip-lib-prefix
-# Arguments: 1: module name
-# Returns  : module name, without any 'lib' prefix if any
-# Usage    : $(call strip-lib-prefix,$(LOCAL_MODULE))
-# -----------------------------------------------------------------------------
-strip-lib-prefix = $(1:lib%=%)
-
-# -----------------------------------------------------------------------------
-# This is used to strip any lib prefix from LOCAL_MODULE, then check that
-# the corresponding module name is not already defined.
-#
-# Function : check-user-LOCAL_MODULE
-# Arguments: 1: path of Android.mk where this LOCAL_MODULE is defined
-# Returns  : None
-# Usage    : $(call check-LOCAL_MODULE,$(LOCAL_MAKEFILE))
-# -----------------------------------------------------------------------------
-check-LOCAL_MODULE = \
-  $(eval LOCAL_MODULE := $$(call strip-lib-prefix,$$(LOCAL_MODULE)))\
-  $(call modules-add,$(LOCAL_MODULE),$1)
-
-# -----------------------------------------------------------------------------
-# Macro    : my-dir
-# Returns  : the directory of the current Makefile
-# Usage    : $(my-dir)
-# -----------------------------------------------------------------------------
-my-dir = $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
-
-# -----------------------------------------------------------------------------
-# Function : all-makefiles-under
-# Arguments: 1: directory path
-# Returns  : a list of all makefiles immediately below some directory
-# Usage    : $(call all-makefiles-under, <some path>)
-# -----------------------------------------------------------------------------
-all-makefiles-under = $(wildcard $1/*/Android.mk)
-
-# -----------------------------------------------------------------------------
-# Macro    : all-subdir-makefiles
-# Returns  : list of all makefiles in subdirectories of the current Makefile's
-#            location
-# Usage    : $(all-subdir-makefiles)
-# -----------------------------------------------------------------------------
-all-subdir-makefiles = $(call all-makefiles-under,$(call my-dir))
-
-# =============================================================================
-#
-# Source file tagging support.
-#
-# Each source file listed in LOCAL_SRC_FILES can have any number of
-# 'tags' associated to it. A tag name must not contain space, and its
-# usage can vary.
-#
-# For example, the 'debug' tag is used to sources that must be built
-# in debug mode, the 'arm' tag is used for sources that must be built
-# using the 32-bit instruction set on ARM platforms, and 'neon' is used
-# for sources that must be built with ARM Advanced SIMD (a.k.a. NEON)
-# support.
-#
-# More tags might be introduced in the future.
-#
-#  LOCAL_SRC_TAGS contains the list of all tags used (initially empty)
-#  LOCAL_SRC_FILES contains the list of all source files.
-#  LOCAL_SRC_TAG.<tagname> contains the set of source file names tagged
-#      with <tagname>
-#  LOCAL_SRC_FILES_TAGS.<filename> contains the set of tags for a given
-#      source file name
-#
-# Tags are processed by a toolchain-specific function (e.g. TARGET-compute-cflags)
-# which will call various functions to compute source-file specific settings.
-# These are currently stored as:
-#
-#  LOCAL_SRC_FILES_TARGET_CFLAGS.<filename> contains the list of
-#      target-specific C compiler flags used to compile a given
-#      source file. This is set by the function TARGET-set-cflags
-#      defined in the toolchain's setup.mk script.
-#
-#  LOCAL_SRC_FILES_TEXT.<filename> contains the 'text' that will be
-#      displayed along the label of the build output line. For example
-#      'thumb' or 'arm  ' with ARM-based toolchains.
-#
-# =============================================================================
-
-# -----------------------------------------------------------------------------
-# Macro    : clear-all-src-tags
-# Returns  : remove all source file tags and associated data.
-# Usage    : $(clear-all-src-tags)
-# -----------------------------------------------------------------------------
-clear-all-src-tags = \
-$(foreach __tag,$(LOCAL_SRC_TAGS), \
-    $(eval LOCAL_SRC_TAG.$(__tag) := $(empty)) \
-) \
-$(foreach __src,$(LOCAL_SRC_FILES), \
-    $(eval LOCAL_SRC_FILES_TAGS.$(__src) := $(empty)) \
-    $(eval LOCAL_SRC_FILES_TARGET_CFLAGS.$(__src) := $(empty)) \
-    $(eval LOCAL_SRC_FILES_TEXT.$(__src) := $(empty)) \
-) \
-$(eval LOCAL_SRC_TAGS := $(empty_set))
-
-# -----------------------------------------------------------------------------
-# Macro    : tag-src-files
-# Arguments: 1: list of source files to tag
-#            2: tag name (must not contain space)
-# Usage    : $(call tag-src-files,<list-of-source-files>,<tagname>)
-# Rationale: Add a tag to a list of source files
-# -----------------------------------------------------------------------------
-tag-src-files = \
-$(eval LOCAL_SRC_TAGS := $(call set_insert,$2,$(LOCAL_SRC_TAGS))) \
-$(eval LOCAL_SRC_TAG.$2 := $(call set_union,$1,$(LOCAL_SRC_TAG.$2))) \
-$(foreach __src,$1, \
-    $(eval LOCAL_SRC_FILES_TAGS.$(__src) += $2) \
-)
-
-# -----------------------------------------------------------------------------
-# Macro    : get-src-files-with-tag
-# Arguments: 1: tag name
-# Usage    : $(call get-src-files-with-tag,<tagname>)
-# Return   : The list of source file names that have been tagged with <tagname>
-# -----------------------------------------------------------------------------
-get-src-files-with-tag = $(LOCAL_SRC_TAG.$1)
-
-# -----------------------------------------------------------------------------
-# Macro    : get-src-files-without-tag
-# Arguments: 1: tag name
-# Usage    : $(call get-src-files-without-tag,<tagname>)
-# Return   : The list of source file names that have NOT been tagged with <tagname>
-# -----------------------------------------------------------------------------
-get-src-files-without-tag = $(filter-out $(LOCAL_SRC_TAG.$1),$(LOCAL_SRC_FILES))
-
-# -----------------------------------------------------------------------------
-# Macro    : set-src-files-target-cflags
-# Arguments: 1: list of source files
-#            2: list of compiler flags
-# Usage    : $(call set-src-files-target-cflags,<sources>,<flags>)
-# Rationale: Set or replace the set of compiler flags that will be applied
-#            when building a given set of source files. This function should
-#            normally be called from the toolchain-specific function that
-#            computes all compiler flags for all source files.
-# -----------------------------------------------------------------------------
-set-src-files-target-cflags = $(foreach __src,$1,$(eval LOCAL_SRC_FILES_TARGET_CFLAGS.$(__src) := $2))
-
-# -----------------------------------------------------------------------------
-# Macro    : add-src-files-target-cflags
-# Arguments: 1: list of source files
-#            2: list of compiler flags
-# Usage    : $(call add-src-files-target-cflags,<sources>,<flags>)
-# Rationale: A variant of set-src-files-target-cflags that can be used
-#            to append, instead of replace, compiler flags for specific
-#            source files.
-# -----------------------------------------------------------------------------
-add-src-files-target-cflags = $(foreach __src,$1,$(eval LOCAL_SRC_FILES_TARGET_CFLAGS.$(__src) += $2))
-
-# -----------------------------------------------------------------------------
-# Macro    : get-src-file-target-cflags
-# Arguments: 1: single source file name
-# Usage    : $(call get-src-file-target-cflags,<source>)
-# Rationale: Return the set of target-specific compiler flags that must be
-#            applied to a given source file. These must be set prior to this
-#            call using set-src-files-target-cflags or add-src-files-target-cflags
-# -----------------------------------------------------------------------------
-get-src-file-target-cflags = $(LOCAL_SRC_FILES_TARGET_CFLAGS.$1)
-
-# -----------------------------------------------------------------------------
-# Macro    : set-src-files-text
-# Arguments: 1: list of source files
-#            2: text
-# Usage    : $(call set-src-files-text,<sources>,<text>)
-# Rationale: Set or replace the 'text' associated to a set of source files.
-#            The text is a very short string that complements the build
-#            label. For example, it will be either 'thumb' or 'arm  ' for
-#            ARM-based toolchains. This function must be called by the
-#            toolchain-specific functions that processes all source files.
-# -----------------------------------------------------------------------------
-set-src-files-text = $(foreach __src,$1,$(eval LOCAL_SRC_FILES_TEXT.$(__src) := $2))
-
-# -----------------------------------------------------------------------------
-# Macro    : get-src-file-text
-# Arguments: 1: single source file
-# Usage    : $(call get-src-file-text,<source>)
-# Rationale: Return the 'text' associated to a given source file when
-#            set-src-files-text was called.
-# -----------------------------------------------------------------------------
-get-src-file-text = $(LOCAL_SRC_FILES_TEXT.$1)
-
-# This should only be called for debugging the source files tagging system
-dump-src-file-tags = \
-$(info LOCAL_SRC_TAGS := $(LOCAL_SRC_TAGS)) \
-$(info LOCAL_SRC_FILES = $(LOCAL_SRC_FILES)) \
-$(foreach __tag,$(LOCAL_SRC_TAGS),$(info LOCAL_SRC_TAG.$(__tag) = $(LOCAL_SRC_TAG.$(__tag)))) \
-$(foreach __src,$(LOCAL_SRC_FILES),$(info LOCAL_SRC_FILES_TAGS.$(__src) = $(LOCAL_SRC_FILES_TAGS.$(__src)))) \
-$(info WITH arm = $(call get-src-files-with-tag,arm)) \
-$(info WITHOUT arm = $(call get-src-files-without-tag,arm)) \
-$(foreach __src,$(LOCAL_SRC_FILES),$(info LOCAL_SRC_FILES_TARGET_CFLAGS.$(__src) = $(LOCAL_SRC_FILES_TARGET_CFLAGS.$(__src)))) \
-$(foreach __src,$(LOCAL_SRC_FILES),$(info LOCAL_SRC_FILES_TEXT.$(__src) = $(LOCAL_SRC_FILES_TEXT.$(__src)))) \
-
-
-# =============================================================================
-#
-# Application.mk support
-#
-# =============================================================================
-
-# the list of variables that *must* be defined in Application.mk files
-NDK_APP_VARS_REQUIRED := APP_MODULES APP_PROJECT_PATH
-
-# the list of variables that *may* be defined in Application.mk files
-NDK_APP_VARS_OPTIONAL := APP_OPTIM APP_CPPFLAGS APP_CFLAGS APP_CXXFLAGS \
-                         APP_PLATFORM APP_BUILD_SCRIPT APP_ABI
-
-# the list of all variables that may appear in an Application.mk file
-NDK_APP_VARS := $(NDK_APP_VARS_REQUIRED) $(NDK_APP_VARS_OPTIONAL)
-
-# =============================================================================
-#
-# Android.mk support
-#
-# =============================================================================
-
-
-# =============================================================================
-#
-# Generated files support
-#
-# =============================================================================
-
-
-# -----------------------------------------------------------------------------
-# Function  : host-static-library-path
-# Arguments : 1: library module name (e.g. 'foo')
-# Returns   : location of generated host library name (e.g. '..../libfoo.a)
-# Usage     : $(call host-static-library-path,<modulename>)
-# -----------------------------------------------------------------------------
-host-static-library-path = $(HOST_OUT)/lib$1.a
-
-# -----------------------------------------------------------------------------
-# Function  : host-executable-path
-# Arguments : 1: executable module name (e.g. 'foo')
-# Returns   : location of generated host executable name (e.g. '..../foo)
-# Usage     : $(call host-executable-path,<modulename>)
-# -----------------------------------------------------------------------------
-host-executable-path = $(HOST_OUT)/$1$(HOST_EXE)
-
-# -----------------------------------------------------------------------------
-# Function  : static-library-path
-# Arguments : 1: library module name (e.g. 'foo')
-# Returns   : location of generated static library name (e.g. '..../libfoo.a)
-# Usage     : $(call static-library-path,<modulename>)
-# -----------------------------------------------------------------------------
-static-library-path = $(TARGET_OUT)/lib$1.a
-
-# -----------------------------------------------------------------------------
-# Function  : shared-library-path
-# Arguments : 1: library module name (e.g. 'foo')
-# Returns   : location of generated shared library name (e.g. '..../libfoo.so)
-# Usage     : $(call shared-library-path,<modulename>)
-# -----------------------------------------------------------------------------
-shared-library-path = $(TARGET_OUT)/lib$1.so
-
-# -----------------------------------------------------------------------------
-# Function  : executable-path
-# Arguments : 1: executable module name (e.g. 'foo')
-# Returns   : location of generated exectuable name (e.g. '..../foo)
-# Usage     : $(call executable-path,<modulename>)
-# -----------------------------------------------------------------------------
-executable-path = $(TARGET_OUT)/$1
-
-# =============================================================================
-#
-# Build commands support
-#
-# =============================================================================
-
-# -----------------------------------------------------------------------------
-# Macro    : hide
-# Returns  : nothing
-# Usage    : $(hide)<make commands>
-# Rationale: To be used as a prefix for Make build commands to hide them
-#            by default during the build. To show them, set V=1 in your
-#            environment or command-line.
-#
-#            For example:
-#
-#                foo.o: foo.c
-#                -->|$(hide) <build-commands>
-#
-#            Where '-->|' stands for a single tab character.
-#
-# -----------------------------------------------------------------------------
-ifeq ($(V),1)
-hide = $(empty)
-else
-hide = @
-endif
-
-# -----------------------------------------------------------------------------
-# Template  : ev-compile-c-source
-# Arguments : 1: single C source file name (relative to LOCAL_PATH)
-#             2: target object file (without path)
-# Returns   : None
-# Usage     : $(eval $(call ev-compile-c-source,<srcfile>,<objfile>)
-# Rationale : Internal template evaluated by compile-c-source and
-#             compile-s-source
-# -----------------------------------------------------------------------------
-define  ev-compile-c-source
-_SRC:=$$(LOCAL_PATH)/$(1)
-_OBJ:=$$(LOCAL_OBJS_DIR)/$(2)
-
-$$(_OBJ): PRIVATE_SRC      := $$(_SRC)
-$$(_OBJ): PRIVATE_OBJ      := $$(_OBJ)
-$$(_OBJ): PRIVATE_MODULE   := $$(LOCAL_MODULE)
-$$(_OBJ): PRIVATE_ARM_MODE := $$(LOCAL_ARM_MODE)
-$$(_OBJ): PRIVATE_ARM_TEXT := $$(call get-src-file-text,$1)
-$$(_OBJ): PRIVATE_CC       := $$($$(my)CC)
-$$(_OBJ): PRIVATE_CFLAGS   := $$($$(my)CFLAGS) \
-                              $$(call get-src-file-target-cflags,$(1)) \
-                              $$(LOCAL_C_INCLUDES:%=-I%) \
-                              -I$$(LOCAL_PATH) \
-                              $$(LOCAL_CFLAGS) \
-                              $$(NDK_APP_CFLAGS)
-
-$$(_OBJ): $$(_SRC) $$(LOCAL_MAKEFILE) $$(NDK_APP_APPLICATION_MK)
-	@mkdir -p $$(dir $$(PRIVATE_OBJ))
-	@echo "Compile $$(PRIVATE_ARM_TEXT)  : $$(PRIVATE_MODULE) <= $$(PRIVATE_SRC)"
-	$(hide) $$(PRIVATE_CC) $$(PRIVATE_CFLAGS) -c \
-	-MMD -MP -MF $$(PRIVATE_OBJ).d.tmp \
-	$$(PRIVATE_SRC) \
-	-o $$(PRIVATE_OBJ)
-	$$(call cmd-process-deps,$$(PRIVATE_OBJ))
-
-LOCAL_OBJECTS         += $$(_OBJ)
-LOCAL_DEPENDENCY_DIRS += $$(dir $$(_OBJ))
-endef
-
-# -----------------------------------------------------------------------------
-# Function  : compile-c-source
-# Arguments : 1: single C source file name (relative to LOCAL_PATH)
-# Returns   : None
-# Usage     : $(call compile-c-source,<srcfile>)
-# Rationale : Setup everything required to build a single C source file
-# -----------------------------------------------------------------------------
-compile-c-source = $(eval $(call ev-compile-c-source,$1,$(1:%.c=%.o)))
-
-# -----------------------------------------------------------------------------
-# Function  : compile-s-source
-# Arguments : 1: single Assembly source file name (relative to LOCAL_PATH)
-# Returns   : None
-# Usage     : $(call compile-s-source,<srcfile>)
-# Rationale : Setup everything required to build a single Assembly source file
-# -----------------------------------------------------------------------------
-compile-s-source = $(eval $(call ev-compile-c-source,$1,$(1:%.S=%.o)))
-
-
-# -----------------------------------------------------------------------------
-# Template  : ev-compile-cpp-source
-# Arguments : 1: single C++ source file name (relative to LOCAL_PATH)
-#             2: target object file (without path)
-# Returns   : None
-# Usage     : $(eval $(call ev-compile-cpp-source,<srcfile>,<objfile>)
-# Rationale : Internal template evaluated by compile-cpp-source
-# -----------------------------------------------------------------------------
-
-define  ev-compile-cpp-source
-_SRC:=$$(LOCAL_PATH)/$(1)
-_OBJ:=$$(LOCAL_OBJS_DIR)/$(2)
-
-$$(_OBJ): PRIVATE_SRC      := $$(_SRC)
-$$(_OBJ): PRIVATE_OBJ      := $$(_OBJ)
-$$(_OBJ): PRIVATE_MODULE   := $$(LOCAL_MODULE)
-$$(_OBJ): PRIVATE_ARM_MODE := $$(LOCAL_ARM_MODE)
-$$(_OBJ): PRIVATE_ARM_TEXT := $$(call get-src-file-text,$1)
-$$(_OBJ): PRIVATE_CXX      := $$($$(my)CXX)
-$$(_OBJ): PRIVATE_CXXFLAGS := $$($$(my)CXXFLAGS) \
-                              $$(call get-src-file-target-cflags,$(1)) \
-                              $$(LOCAL_C_INCLUDES:%=-I%) \
-                              -I$$(LOCAL_PATH) \
-                              $$(LOCAL_CFLAGS) \
-                              $$(LOCAL_CPPFLAGS) \
-                              $$(LOCAL_CXXFLAGS) \
-                              $$(NDK_APP_CFLAGS) \
-                              $$(NDK_APP_CPPFLAGS) \
-                              $$(NDK_APP_CXXFLAGS) \
-
-$$(_OBJ): $$(_SRC) $$(LOCAL_MAKEFILE) $$(NDK_APP_APPLICATION_MK)
-	@mkdir -p $$(dir $$(PRIVATE_OBJ))
-	@echo "Compile++ $$(PRIVATE_ARM_TEXT): $$(PRIVATE_MODULE) <= $$(PRIVATE_SRC)"
-	$(hide) $$(PRIVATE_CXX) $$(PRIVATE_CXXFLAGS) -c \
-	-MMD -MP -MF $$(PRIVATE_OBJ).d.tmp \
-	$$(PRIVATE_SRC) \
-	-o $$(PRIVATE_OBJ)
-	$$(call cmd-process-deps,$$(PRIVATE_OBJ))
-
-LOCAL_OBJECTS         += $$(_OBJ)
-LOCAL_DEPENDENCY_DIRS += $$(dir $$(_OBJ))
-endef
-
-# -----------------------------------------------------------------------------
-# Function  : compile-cpp-source
-# Arguments : 1: single C++ source file name (relative to LOCAL_PATH)
-# Returns   : None
-# Usage     : $(call compile-c-source,<srcfile>)
-# Rationale : Setup everything required to build a single C++ source file
-# -----------------------------------------------------------------------------
-compile-cpp-source = $(eval $(call ev-compile-cpp-source,$1,$(1:%$(LOCAL_CPP_EXTENSION)=%.o)))
-
-# -----------------------------------------------------------------------------
-# Command   : cmd-process-deps
-# Arguments : 1: object file path
-# Returns   : None
-# Usage     : $(call cmd-process-deps,<objectfile>)
-# Rationale : To be used as a Make build command to process the dependencies
-#             generated by the compiler (in <obj>.d.tmp) into ones suited
-#             for our build system. See the comments in build/core/mkdeps.sh
-#             for more details.
-# -----------------------------------------------------------------------------
-cmd-process-deps = $(hide) $(BUILD_SYSTEM)/mkdeps.sh $(1) $(1).d.tmp $(1).d
-
-# -----------------------------------------------------------------------------
-# Command   : cmd-install-file
-# Arguments : 1: source file
-#             2: destination file
-# Returns   : None
-# Usage     : $(call cmd-install-file,<srcfile>,<dstfile>)
-# Rationale : To be used as a Make build command to copy/install a file to
-#             a given location.
-# -----------------------------------------------------------------------------
-define cmd-install-file
-@mkdir -p $(dir $2)
-$(hide) cp -fp $1 $2
-endef
diff --git a/ndk/build/core/extract-platform.awk b/ndk/build/core/extract-platform.awk
deleted file mode 100644
index c138e1e..0000000
--- a/ndk/build/core/extract-platform.awk
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-# A nawk/gawk script used to extract the application's platform name from
-# its default.properties file. It is called from build/core/add-application.mk
-#
-
-# we look for a line that looks like one of:
-#    target=android-<api>
-#    target=<vendor>:<name>:<api>
-#
-# <api> is a number, but can also be "Donut" for the first form,
-# as a special case.
-#
-BEGIN {
-    android_regex="android-[0-9A-Za-z_-]+"
-    vendor_regex=":[0-9]+\\s*$"
-    API=unknown
-}
-
-/^target\s*=\s*.*/ {
-    if (match($0,android_regex)) {
-        API=substr($0,RSTART,RLENGTH)
-    }
-    else if (match($0,vendor_regex)) {
-        API="android-" substr($0,RSTART+1,RLENGTH)
-    }
-}
-
-END {
-    printf("%s", API)
-}
diff --git a/ndk/build/core/install-binary.mk b/ndk/build/core/install-binary.mk
deleted file mode 100644
index 63b5425..0000000
--- a/ndk/build/core/install-binary.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-
-# Installed module handling
-#
-LOCAL_INSTALLED_MODULE := $(NDK_APP_DEST)/$(notdir $(LOCAL_BUILT_MODULE))
-
-$(LOCAL_INSTALLED_MODULE): PRIVATE_NAME := $(notdir $(LOCAL_BUILT_MODULE))
-$(LOCAL_INSTALLED_MODULE): PRIVATE_SRC  := $(LOCAL_BUILT_MODULE)
-$(LOCAL_INSTALLED_MODULE): PRIVATE_DEST := $(NDK_APP_DEST)
-$(LOCAL_INSTALLED_MODULE): PRIVATE_DST  := $(LOCAL_INSTALLED_MODULE)
-
-$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) clean-installed-binaries
-	@ echo "Install        : $(PRIVATE_NAME) => $(PRIVATE_DEST)"
-	$(hide) mkdir -p $(PRIVATE_DEST)
-	$(hide) install -p $(PRIVATE_SRC) $(PRIVATE_DST)
-	$(hide) $(call cmd-strip, $(PRIVATE_DST))
-
-ALL_INSTALLED_MODULES += $(LOCAL_INSTALLED_MODULE)
-
diff --git a/ndk/build/core/main.mk b/ndk/build/core/main.mk
deleted file mode 100644
index 8285e41..0000000
--- a/ndk/build/core/main.mk
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-
-# ====================================================================
-#
-# Define the main configuration variables, and read the host-specific
-# configuration file that is normally generated by build/host-setup.sh
-#
-# ====================================================================
-
-# The location of the build system files
-BUILD_SYSTEM := $(strip $(dir $(lastword $(MAKEFILE_LIST))))
-BUILD_SYSTEM := $(BUILD_SYSTEM:%/=%)
-
-# Include common definitions
-include build/core/definitions.mk
-
-# Where all generated files will be stored during a build
-NDK_OUT := out
-
-# Read the host-specific configuration file in $(NDK_OUT)
-#
-HOST_CONFIG_MAKE := $(NDK_OUT)/host/config.mk
-
-ifeq ($(strip $(wildcard $(HOST_CONFIG_MAKE))),)
-    $(call __ndk_info,\
-    The configuration file '$(HOST_CONFIG_MAKE)' doesnt' exist.)
-    $(call __ndk_info,\
-       Please run 'build/host-setup.sh' to generate it.)
-    $(call __ndk_error, Aborting)
-endif
-
-include $(HOST_CONFIG_MAKE)
-HOST_PREBUILT_TAG := $(HOST_TAG)
-
-# Location where all prebuilt binaries for a given host architectures
-# will be stored.
-HOST_PREBUILT := build/prebuilt/$(HOST_TAG)
-
-# Where all app-specific generated files will be stored
-NDK_APP_OUT := $(NDK_OUT)/apps
-
-# Where all host-specific generated files will be stored
-NDK_HOST_OUT := $(NDK_OUT)/host/$(HOST_TAG)
-
-# ====================================================================
-#
-# Read all toolchain-specific configuration files.
-#
-# Each toolchain must have a corresponding config.mk file located
-# in build/toolchains/<name>/ that will be included here.
-#
-# Each one of these files should define the following variables:
-#   TOOLCHAIN_NAME   toolchain name (e.g. arm-eabi-4.2.1)
-#   TOOLCHAIN_ABIS   list of target ABIs supported by the toolchain.
-#
-# Then, it should include $(ADD_TOOLCHAIN) which will perform
-# book-keeping for the build system.
-#
-# ====================================================================
-
-# the build script to include in each toolchain config.mk
-ADD_TOOLCHAIN := $(BUILD_SYSTEM)/add-toolchain.mk
-
-# the list of all toolchains in this NDK
-NDK_ALL_TOOLCHAINS :=
-NDK_ALL_ABIS       :=
-
-TOOLCHAIN_CONFIGS := $(wildcard build/toolchains/*/config.mk)
-$(foreach _config_mk,$(TOOLCHAIN_CONFIGS),\
-  $(eval include $(BUILD_SYSTEM)/add-toolchain.mk)\
-)
-
-NDK_ALL_TOOLCHAINS   := $(call uniq,$(NDK_ALL_TOOLCHAINS))
-NDK_ALL_ABIS         := $(call uniq,$(NDK_ALL_ABIS))
-
-# The default toolchain is now arm-eabi-4.4.0, however its
-# C++ compiler is a tad bit more pedantic with certain
-# constructs (e.g. templates) so allow users to switch back
-# to the old 4.2.1 instead if they really want to.
-#
-# NOTE: you won't get armeabi-v7a support though !
-#
-NDK_TOOLCHAIN := $(strip $(NDK_TOOLCHAIN))
-ifndef NDK_TOOLCHAIN
-    NDK_TARGET_TOOLCHAIN := arm-eabi-4.4.0
-    $(call ndk_log, Default toolchain is $(NDK_TARGET_TOOLCHAIN))
-else
-    # check that the toolchain name is supported
-    $(if $(filter-out $(NDK_ALL_TOOLCHAINS),$(NDK_TOOLCHAIN)),\
-      $(call __ndk_info,NDK_TOOLCHAIN is defined to the unsupported value $(NDK_TOOLCHAIN)) \
-      $(call __ndk_info,Please use one of the following values: $(NDK_ALL_TOOLCHAINS))\
-      $(call __ndk_error,Aborting)\
-    ,)
-    NDK_TARGET_TOOLCHAIN=$(NDK_TOOLCHAIN)
-    $(call ndk_log, Using specific toolchain $(NDK_TARGET_TOOLCHAIN))
-endif
-
-$(call ndk_log, This NDK supports the following toolchains and target ABIs:)
-$(foreach tc,$(NDK_ALL_TOOLCHAINS),\
-    $(call ndk_log, $(space)$(space)$(tc):  $(NDK_TOOLCHAIN.$(tc).abis))\
-)
-
-# ====================================================================
-#
-# Read all platform-specific configuration files.
-#
-# Each platform must be located in build/platforms/android-<apilevel>
-# where <apilevel> corresponds to an API level number, with:
-#   3 -> Android 1.5
-#   4 -> next platform release
-#
-# ====================================================================
-
-NDK_PLATFORMS_ROOT := $(BUILD_SYSTEM)/../platforms
-NDK_ALL_PLATFORMS := $(strip $(notdir $(wildcard $(NDK_PLATFORMS_ROOT)/android-*)))
-$(call ndk_log,Found supported platforms: $(NDK_ALL_PLATFORMS))
-
-$(foreach _platform,$(NDK_ALL_PLATFORMS),\
-  $(eval include $(BUILD_SYSTEM)/add-platform.mk)\
-)
-
-# we're going to find the maximum platform number of the form android-<number>
-# ignore others, which could correspond to special and experimental cases
-NDK_ALL_PLATFORM_LEVELS := $(filter android-%,$(NDK_ALL_PLATFORMS))
-NDK_ALL_PLATFORM_LEVELS := $(patsubst android-%,%,$(NDK_ALL_PLATFORM_LEVELS))
-$(call ndk_log,Found stable platform levels: $(NDK_ALL_PLATFORM_LEVELS))
-
-NDK_MAX_PLATFORM_LEVEL := 3
-$(foreach level,$(NDK_ALL_PLATFORM_LEVELS),\
-  $(eval NDK_MAX_PLATFORM_LEVEL := $$(call max,$$(NDK_MAX_PLATFORM_LEVEL),$$(level)))\
-)
-$(call ndk_log,Found max platform level: $(NDK_MAX_PLATFORM_LEVEL))
-
-# ====================================================================
-#
-# Read all application configuration files
-#
-# Each 'application' must have a corresponding Application.mk file
-# located in apps/<name> where <name> is a liberal name that doesn't
-# contain any space in it, used to uniquely identify the
-#
-# See docs/ANDROID-MK.TXT for their specification.
-#
-# ====================================================================
-
-NDK_ALL_APPS :=
-
-NDK_APPLICATIONS := $(wildcard apps/*/Application.mk)
-$(foreach _application_mk, $(NDK_APPLICATIONS),\
-  $(eval include $(BUILD_SYSTEM)/add-application.mk)\
-)
-
-# clean up environment, just to be safe
-$(call clear-vars, $(NDK_APP_VARS))
-
-ifeq ($(strip $(NDK_ALL_APPS)),)
-  $(call __ndk_info,\
-    The NDK could not find a proper application description under apps/*/Application.mk)
-  $(call __ndk_info,\
-    Please follow the instructions in docs/NDK-APPS.TXT to write one.)
-  $(call __ndk_error, Aborting)
-endif
-
-ifeq ($(strip $(APP)),)
-  $(call __ndk_info,\
-    The APP variable is undefined or empty.)
-  $(call __ndk_info,\
-    Please define it to one of: $(NDK_ALL_APPS))
-  $(call __ndk_info,\
-    You can also add new applications by writing an Application.mk file.)
-  $(call __ndk_info,\
-    See docs/APPLICATION-MK.TXT for details.)
-  $(call __ndk_error, Aborting)
-endif
-
-# now check that APP doesn't contain an unknown app name
-# if it does, we ignore them if there is at least one known
-# app name in the list. Otherwise, abort with an error message
-#
-_unknown_apps := $(filter-out $(NDK_ALL_APPS),$(APP))
-_known_apps   := $(filter     $(NDK_ALL_APPS),$(APP))
-
-NDK_APPS := $(APP)
-
-$(if $(_unknown_apps),\
-  $(if $(_known_apps),\
-    $(call __ndk_info,WARNING:\
-        Removing unknown names from APP variable: $(_unknown_apps))\
-    $(eval NDK_APPS := $(_known_apps))\
-   ,\
-    $(call __ndk_info,\
-        The APP variable contains unknown app names: $(_unknown_apps))\
-    $(call __ndk_info,\
-        Please use one of: $(NDK_ALL_APPS))\
-    $(call __ndk_error, Aborting)\
-  )\
-)
-
-$(call __ndk_info,Building for application '$(NDK_APPS)')
-
-# ====================================================================
-#
-# Prepare the build for parsing Android.mk files
-#
-# ====================================================================
-
-# These phony targets are used to control various stages of the build
-.PHONY: all \
-        host_libraries host_executables \
-        installed_modules \
-        executables libraries static_libraries shared_libraries \
-        clean clean-config clean-objs-dir \
-        clean-executables clean-libraries \
-        clean-installed-modules \
-        clean-installed-binaries
-
-# These macros are used in Android.mk to include the corresponding
-# build script that will parse the LOCAL_XXX variable definitions.
-#
-CLEAR_VARS                := $(BUILD_SYSTEM)/clear-vars.mk
-BUILD_HOST_EXECUTABLE     := $(BUILD_SYSTEM)/build-host-executable.mk
-BUILD_HOST_STATIC_LIBRARY := $(BUILD_SYSTEM)/build-host-static-library.mk
-BUILD_STATIC_LIBRARY      := $(BUILD_SYSTEM)/build-static-library.mk
-BUILD_SHARED_LIBRARY      := $(BUILD_SYSTEM)/build-shared-library.mk
-BUILD_EXECUTABLE          := $(BUILD_SYSTEM)/build-executable.mk
-
-ANDROID_MK_INCLUDED := \
-  $(CLEAR_VARS) \
-  $(BUILD_HOST_EXECUTABLE) \
-  $(BUILD_HOST_STATIC_LIBRARY) \
-  $(BUILD_STATIC_LIBRARY) \
-  $(BUILD_SHARED_LIBRARY) \
-  $(BUILD_EXECUTABLE) \
-
-
-# this is the list of directories containing dependency information
-# generated during the build. It will be updated by build scripts
-# when module definitions are parsed.
-#
-ALL_DEPENDENCY_DIRS :=
-
-# this is the list of all generated files that we would need to clean
-ALL_HOST_EXECUTABLES      :=
-ALL_HOST_STATIC_LIBRARIES :=
-ALL_STATIC_LIBRARIES      :=
-ALL_SHARED_LIBRARIES      :=
-ALL_EXECUTABLES           :=
-ALL_INSTALLED_MODULES     :=
-
-# the first rule
-all: installed_modules host_libraries host_executables
-
-
-$(foreach _app,$(NDK_APPS),\
-  $(eval include $(BUILD_SYSTEM)/setup-app.mk)\
-)
-
-# ====================================================================
-#
-# Now finish the build preparation with a few rules that depend on
-# what has been effectively parsed and recorded previously
-#
-# ====================================================================
-
-clean: clean-intermediates clean-installed-modules
-
-distclean: clean clean-config
-
-installed_modules: libraries $(ALL_INSTALLED_MODULES)
-host_libraries: $(HOST_STATIC_LIBRARIES)
-host_executables: $(HOST_EXECUTABLES)
-
-static_libraries: $(STATIC_LIBRARIES)
-shared_libraries: $(SHARED_LIBRARIES)
-executables: $(EXECUTABLES)
-
-libraries: static_libraries shared_libraries
-
-clean-host-intermediates:
-	$(hide) rm -rf $(HOST_EXECUTABLES) $(HOST_STATIC_LIBRARIES)
-
-clean-intermediates: clean-host-intermediates
-	$(hide) rm -rf $(EXECUTABLES) $(STATIC_LIBRARIES) $(SHARED_LIBRARIES)
-
-clean-installed-modules:
-	$(hide) rm -rf $(ALL_INSTALLED_MODULES)
-
-clean-config:
-	$(hide) rm -f $(CONFIG_MAKE) $(CONFIG_H)
-
-# include dependency information
-ALL_DEPENDENCY_DIRS := $(sort $(ALL_DEPENDENCY_DIRS))
--include $(wildcard $(ALL_DEPENDENCY_DIRS:%=%/*.d))
diff --git a/ndk/build/core/mkdeps.sh b/ndk/build/core/mkdeps.sh
deleted file mode 100755
index abecec7..0000000
--- a/ndk/build/core/mkdeps.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# 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.
-#
-# This script is used to transform the dependency files generated by GCC
-# For example, a typical .d file will have a line like:
-#
-#    source.o: /full/path/to/source.c other.h headers.h
-#    ...
-#
-# the script is used to replace 'source.o' to a full path, as in
-#
-#    objs/intermediates/emulator/source.o: /full/path/to/source.c other.h headers.h
-#
-# parameters
-#
-# $1: object file (full path)
-# $2: source dependency file to modify (erased on success)
-# $3: target source dependency file
-#
-
-# quote the object path. we change a single '.' into
-# a '\.' since this will be parsed by sed.
-#
-OBJECT=`echo $1 | sed -e s/\\\\./\\\\\\\\./g`
-#echo OBJECT=$OBJECT
-
-OBJ_NAME=`basename $OBJECT`
-#echo OBJ_NAME=$OBJ_NAME
-
-# we replace $OBJ_NAME with $OBJECT only if $OBJ_NAME starts the line
-# that's because some versions of GCC (e.g. 4.2.3) already produce
-# a correct dependency line with the full path to the object file.
-# In this case, we don't want to touch anything
-#
-cat $2 | sed -e s%^$OBJ_NAME%$OBJECT%g > $3 && rm -f $2
-
-
-
diff --git a/ndk/build/core/ndk-common.sh b/ndk/build/core/ndk-common.sh
deleted file mode 100644
index 4ca36ec..0000000
--- a/ndk/build/core/ndk-common.sh
+++ /dev/null
@@ -1,403 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-
-# A collection of shell function definitions used by various build scripts
-# in the Android NDK (Native Development Kit)
-#
-
-# Get current script name into PROGNAME
-PROGNAME=`basename $0`
-
-# Put location of Android NDK into ANDROID_NDK_ROOT and
-# perform a tiny amount of sanity check
-#
-if [ -z "$ANDROID_NDK_ROOT" ] ; then
-    # Try to auto-detect the NDK root by walking up the directory
-    # path to the current script.
-    PROGDIR=`dirname $0`
-    while [ -n "1" ] ; do
-        if [ -d $PROGDIR/build/core ] ; then
-            break
-        fi
-        if [ -z $PROGDIR -o $PROGDIR = '.' ] ; then
-            echo "Please define ANDROID_NDK_ROOT to point to the root of your"
-            echo "Android NDK installation."
-            exit 1
-        fi
-        PROGDIR=`dirname $PROGDIR`
-    done
-    ANDROID_NDK_ROOT=`cd $PROGDIR && pwd`
-fi
-
-if [ ! -d $ANDROID_NDK_ROOT ] ; then
-    echo "ERROR: Your ANDROID_NDK_ROOT variable does not point to a directory."
-    exit 1
-fi
-
-if [ ! -f $ANDROID_NDK_ROOT/build/core/ndk-common.sh ] ; then
-    echo "ERROR: Your ANDROID_NDK_ROOT variable does not point to a valid directory."
-    exit 1
-fi
-
-## Logging support
-##
-VERBOSE=${VERBOSE-yes}
-VERBOSE2=${VERBOSE2-no}
-
-log ()
-{
-    if [ "$VERBOSE" = "yes" ] ; then
-        echo "$1"
-    fi
-}
-
-log2 ()
-{
-    if [ "$VERBOSE2" = "yes" ] ; then
-        echo "$1"
-    fi
-}
-
-## Utilities
-##
-
-# return the value of a given named variable
-# $1: variable name
-#
-# example:
-#    FOO=BAR
-#    BAR=ZOO
-#    echo `var_value $FOO`
-#    will print 'ZOO'
-#
-var_value ()
-{
-    # find a better way to do that ?
-    eval echo "$`echo $1`"
-}
-
-# convert to uppercase
-# assumes tr is installed on the platform ?
-#
-to_uppercase ()
-{
-    echo $1 | tr "[:lower:]" "[:upper:]"
-}
-
-## Normalize OS and CPU
-##
-HOST_ARCH=`uname -m`
-case "$HOST_ARCH" in
-    i?86) HOST_ARCH=x86
-    ;;
-    amd64) HOST_ARCH=x86_64
-    ;;
-    powerpc) HOST_ARCH=ppc
-    ;;
-esac
-
-log2 "HOST_ARCH=$HOST_ARCH"
-
-# at this point, the supported values for CPU are:
-#   x86
-#   x86_64
-#   ppc
-#
-# other values may be possible but haven't been tested
-#
-HOST_EXE=""
-HOST_OS=`uname -s`
-case "$HOST_OS" in
-    Darwin)
-        HOST_OS=darwin
-        ;;
-    Linux)
-        # note that building  32-bit binaries on x86_64 is handled later
-        HOST_OS=linux
-        ;;
-    FreeBsd)  # note: this is not tested
-        HOST_OS=freebsd
-        ;;
-    CYGWIN*|*_NT-*)
-        HOST_OS=windows
-        HOST_EXE=.exe
-        if [ "x$OSTYPE" = xcygwin ] ; then
-            HOST_OS=cygwin
-        fi
-        ;;
-esac
-
-log2 "HOST_OS=$HOST_OS"
-log2 "HOST_EXE=$HOST_EXE"
-
-# at this point, the value of HOST_OS should be one of the following:
-#   linux
-#   darwin
-#    windows (MSys)
-#    cygwin
-#
-# Note that cygwin is treated as a special case because it behaves very differently
-# for a few things. Other values may be possible but have not been tested
-#
-
-# define HOST_TAG as a unique tag used to identify both the host OS and CPU
-# supported values are:
-#
-#   linux-x86
-#   linux-x86_64
-#   darwin-x86
-#   darwin-ppc
-#   windows
-#
-# other values are possible but were not tested.
-#
-compute_host_tag ()
-{
-    case "$HOST_OS" in
-        windows|cygwin)
-            HOST_TAG="windows"
-            ;;
-        *)  HOST_TAG="${HOST_OS}-${HOST_ARCH}"
-    esac
-    log2 "HOST_TAG=$HOST_TAG"
-}
-
-compute_host_tag
-
-# Compute the number of host CPU cores an HOST_NUM_CPUS
-#
-case "$HOST_OS" in
-    linux)
-        HOST_NUM_CPUS=`cat /proc/cpuinfo | grep processor | wc -l`
-        ;;
-    darwin|freebsd)
-        HOST_NUM_CPUS=`sysctl -n hw.ncpu`
-        ;;
-    windows|cygwin)
-        HOST_NUM_CPUS=$NUMBER_OF_PROCESSORS
-        ;;
-    *)  # let's play safe here
-        HOST_NUM_CPUS=1
-esac
-
-log2 "HOST_NUM_CPUS=$HOST_NUM_CPUS"
-
-# If BUILD_NUM_CPUS is not already defined in your environment,
-# define it as the double of HOST_NUM_CPUS. This is used to
-# run Make commends in parralles, as in 'make -j$BUILD_NUM_CPUS'
-#
-if [ -z "$BUILD_NUM_CPUS" ] ; then
-    BUILD_NUM_CPUS=`expr $HOST_NUM_CPUS \* 2`
-fi
-
-log2 "BUILD_NUM_CPUS=$BUILD_NUM_CPUS"
-
-
-##  HOST TOOLCHAIN SUPPORT
-##
-
-# force the generation of 32-bit binaries on 64-bit systems
-#
-FORCE_32BIT=no
-force_32bit_binaries ()
-{
-    if [ "$HOST_ARCH" = x86_64 ] ; then
-        log2 "Forcing generation of 32-bit host binaries on $HOST_ARCH"
-        FORCE_32BIT=yes
-        HOST_ARCH=x86
-        log2 "HOST_ARCH=$HOST_ARCH"
-        compute_host_tag
-    fi
-}
-
-# On Windows, cygwin binaries will be generated by default, but
-# you can force mingw ones that do not link to cygwin.dll if you
-# call this function.
-#
-disable_cygwin ()
-{
-    if [ $OS = cygwin ] ; then
-        log2 "Disabling cygwin binaries generation"
-        CFLAGS="$CFLAGS -mno-cygwin"
-        LDFLAGS="$LDFLAGS -mno-cygwin"
-        OS=windows
-        HOST_OS=windows
-        compute_host_tag
-    fi
-}
-
-# Various probes are going to need to run a small C program
-TMPC=/tmp/android-$$-test.c
-TMPO=/tmp/android-$$-test.o
-TMPE=/tmp/android-$$-test$EXE
-TMPL=/tmp/android-$$-test.log
-
-# cleanup temporary files
-clean_temp ()
-{
-    rm -f $TMPC $TMPO $TMPL $TMPE
-}
-
-# cleanup temp files then exit with an error
-clean_exit ()
-{
-    clean_temp
-    exit 1
-}
-
-# this function will setup the compiler and linker and check that they work as advertised
-# note that you should call 'force_32bit_binaries' before this one if you want it to
-# generate 32-bit binaries on 64-bit systems (that support it).
-#
-setup_toolchain ()
-{
-    if [ -z "$CC" ] ; then
-        CC=gcc
-    fi
-
-    log2 "Using '$CC' as the C compiler"
-
-    # check that we can compile a trivial C program with this compiler
-    cat > $TMPC <<EOF
-int main(void) {}
-EOF
-
-    if [ "$FORCE_32BIT" = yes ] ; then
-        CFLAGS="$CFLAGS -m32"
-        LDFLAGS="$LDFLAGS -m32"
-        compile
-        if [ $? != 0 ] ; then
-            # sometimes, we need to also tell the assembler to generate 32-bit binaries
-            # this is highly dependent on your GCC installation (and no, we can't set
-            # this flag all the time)
-            CFLAGS="$CFLAGS -Wa,--32"
-            compile
-        fi
-    fi
-
-    compile
-    if [ $? != 0 ] ; then
-        echo "your C compiler doesn't seem to work:"
-        cat $TMPL
-        clean_exit
-    fi
-    log "CC         : compiler check ok ($CC)"
-
-    # check that we can link the trivial program into an executable
-    if [ -z "$LD" ] ; then
-        LD=$CC
-    fi
-    link
-    if [ $? != 0 ] ; then
-        OLD_LD=$LD
-        LD=gcc
-        compile
-        link
-        if [ $? != 0 ] ; then
-            LD=$OLD_LD
-            echo "your linker doesn't seem to work:"
-            cat $TMPL
-            clean_exit
-        fi
-    fi
-    log2 "Using '$LD' as the linker"
-    log "LD         : linker check ok ($LD)"
-
-    # check the C++ compiler
-    if [ -z "$CXX" ] ; then
-        CXX=g++
-    fi
-    if [ -z "$CXXFLAGS" ] ; then
-        CXXFLAGS=$CFLAGS
-    fi
-
-    log2 "Using '$CXX' as the C++ compiler"
-
-    cat > $TMPC <<EOF
-#include <iostream>
-using namespace std;
-int main()
-{
-  cout << "Hello World!" << endl;
-  return 0;
-}
-EOF
-
-    compile_cpp
-    if [ $? != 0 ] ; then
-        echo "your C++ compiler doesn't seem to work"
-        cat $TMPL
-        clean_exit
-    fi
-
-    log "CXX        : C++ compiler check ok ($CXX)"
-
-    # XXX: TODO perform AR checks
-    AR=ar
-    ARFLAGS=
-}
-
-# try to compile the current source file in $TMPC into an object
-# stores the error log into $TMPL
-#
-compile ()
-{
-    log2 "Object     : $CC -o $TMPO -c $CFLAGS $TMPC"
-    $CC -o $TMPO -c $CFLAGS $TMPC 2> $TMPL
-}
-
-compile_cpp ()
-{
-    log2 "Object     : $CXX -o $TMPO -c $CXXFLAGS $TMPC"
-    $CXX -o $TMPO -c $CXXFLAGS $TMPC 2> $TMPL
-}
-
-# try to link the recently built file into an executable. error log in $TMPL
-#
-link()
-{
-    log2 "Link      : $LD -o $TMPE $TMPO $LDFLAGS"
-    $LD -o $TMPE $TMPO $LDFLAGS 2> $TMPL
-}
-
-# run a command
-#
-execute()
-{
-    log2 "Running: $*"
-    $*
-}
-
-# perform a simple compile / link / run of the source file in $TMPC
-compile_exec_run()
-{
-    log2 "RunExec    : $CC -o $TMPE $CFLAGS $TMPC"
-    compile
-    if [ $? != 0 ] ; then
-        echo "Failure to compile test program"
-        cat $TMPC
-        cat $TMPL
-        clean_exit
-    fi
-    link
-    if [ $? != 0 ] ; then
-        echo "Failure to link test program"
-        cat $TMPC
-        echo "------"
-        cat $TMPL
-        clean_exit
-    fi
-    $TMPE
-}
diff --git a/ndk/build/core/setup-abi.mk b/ndk/build/core/setup-abi.mk
deleted file mode 100644
index f548823..0000000
--- a/ndk/build/core/setup-abi.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-
-# this file is included multiple times by build/core/setup-app.mk
-#
-
-$(call ndk_log,Building application '$(NDK_APP_NAME)' for ABI '$(TARGET_ARCH_ABI)')
-
-TARGET_ARCH := arm
-
-TARGET_OUT  := $(NDK_APP_OUT)/$(_app)/$(TARGET_ARCH_ABI)
-TARGET_OBJS := $(TARGET_OUT)/objs
-
-TARGET_GDB_SETUP := $(TARGET_OUT)/setup.gdb
-
-include $(BUILD_SYSTEM)/setup-toolchain.mk
diff --git a/ndk/build/core/setup-app.mk b/ndk/build/core/setup-app.mk
deleted file mode 100644
index f8f57b6..0000000
--- a/ndk/build/core/setup-app.mk
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-
-# this file is included repeatedly from build/core/main.mk
-# and is used to prepare for app-specific build rules.
-#
-
-$(call assert-defined,_app)
-
-_map := NDK_APP.$(_app)
-
-# ok, let's parse all Android.mk source files in order to build
-# the modules for this app.
-#
-
-# Restore the APP_XXX variables just for this pass as NDK_APP_XXX
-#
-NDK_APP_NAME           := $(_app)
-NDK_APP_APPLICATION_MK := $(call get,$(_map),Application.mk)
-
-$(foreach __name,$(NDK_APP_VARS),\
-  $(eval NDK_$(__name) := $(call get,$(_map),$(__name)))\
-)
-
-# set release/debug build flags
-#
-ifeq ($(NDK_APP_OPTIM),debug)
-  NDK_APP_CFLAGS := -O0 -g $(NDK_APP_CFLAGS)
-else
-  NDK_APP_CFLAGS := -O2 -DNDEBUG -g $(NDK_APP_CFLAGS)
-endif
-
-# make the application depend on the modules it requires
-.PHONY: ndk-app-$(_app)
-ndk-app-$(_app): $(NDK_APP_MODULES)
-all: ndk-app-$(_app)
-
-# which platform/abi/toolchain are we going to use?
-TARGET_PLATFORM := $(call get,$(_map),APP_PLATFORM)
-
-# the location of generated files for this app
-HOST_OUT    := $(NDK_APP_OUT)/$(_app)/$(HOST_TAG)
-HOST_OBJS   := $(HOST_OUT)/objs
-
-# the target to use
-TARGET_TOOLCHAIN := $(NDK_TARGET_TOOLCHAIN)
-
-APP_ABI := $(strip $(NDK_APP_ABI))
-ifndef APP_ABI
-    # the default ABI for now is armeabi
-    APP_ABI := armeabi
-endif
-
-# check the target ABIs for this application
-_bad_abis = $(strip $(filter-out $(NDK_ALL_ABIS),$(APP_ABI)))
-ifneq ($(_bad_abis),)
-    $(call __ndk_info,NDK Application '$(_app)' targets unknown ABI(s): $(_bad_abis))
-    $(call __ndk_info,Please fix the APP_ABI definition in $(NDK_APP_APPLICATION_MK))
-    $(call __ndk_error,Aborting)
-endif
-
-# Clear all installed binaries for this application
-# This ensures that if the build fails, you're not going to mistakenly
-# package an obsolete version of it. Or if you change the ABIs you're targetting,
-# you're not going to leave a stale shared library for the old one.
-#
-ifeq ($($(_map).cleaned_binaries),)
-    $(_map).cleaned_binaries := true
-    clean-installed-binaries:
-	$(hide) rm -f $(NDK_ALL_ABIS:%=$(NDK_APP_PROJECT_PATH)/libs/%/lib*.so)
-endif
-
-$(foreach _abi,$(APP_ABI),\
-    $(eval TARGET_ARCH_ABI := $(_abi))\
-    $(eval include $(BUILD_SYSTEM)/setup-abi.mk) \
-)
-
diff --git a/ndk/build/core/setup-toolchain.mk b/ndk/build/core/setup-toolchain.mk
deleted file mode 100644
index e5d4e82..0000000
--- a/ndk/build/core/setup-toolchain.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-
-# this file is included repeatedly from build/core/setup-abi.mk and is used
-# to setup the target toolchain for a given platform/abi combination.
-#
-
-$(call assert-defined,TARGET_TOOLCHAIN TARGET_PLATFORM TARGET_ARCH TARGET_ARCH_ABI)
-$(call assert-defined,NDK_APPS)
-
-# Check that the toolchain supports the current ABI
-$(if $(filter-out $(NDK_TOOLCHAIN.$(NDK_TARGET_TOOLCHAIN).abis),$(TARGET_ARCH_ABI)),\
-    $(call __ndk_info,The $(NDK_TARGET_TOOLCHAIN) toolchain does not support the $(TARGET_ARCH_ABI) ABI.)\
-    $(call __ndk_info,Please modify the APP_ABI definition in $(NDK_APP_APPLICATION_MK) to fix this)\
-    $(call __ndk_info,Valid ABIs values for $(NDK_TARGET_TOOLCHAIN) are: $(NDK_TARGET_TOOLCHAIN.$(NDK_TOOLCHAIN).abis))\
-    $(call __ndk_error,Aborting)\
-,)
-
-TARGET_ABI := $(TARGET_PLATFORM)-$(TARGET_ARCH_ABI)
-
-# setup sysroot-related variables. The SYSROOT point to a directory
-# that contains all public header files for a given platform, plus
-# some libraries and object files used for linking the generated
-# target files properly.
-#
-SYSROOT := build/platforms/$(TARGET_PLATFORM)/arch-$(TARGET_ARCH)
-
-TARGET_CRTBEGIN_STATIC_O  := $(SYSROOT)/usr/lib/crtbegin_static.o
-TARGET_CRTBEGIN_DYNAMIC_O := $(SYSROOT)/usr/lib/crtbegin_dynamic.o
-TARGET_CRTEND_O           := $(SYSROOT)/usr/lib/crtend_android.o
-
-TARGET_PREBUILT_SHARED_LIBRARIES := libc libstdc++ libm
-TARGET_PREBUILT_SHARED_LIBRARIES := $(TARGET_PREBUILT_SHARED_LIBRARIES:%=$(SYSROOT)/usr/lib/%.so)
-
-# now call the toolchain-specific setup script
-include $(NDK_TOOLCHAIN.$(TARGET_TOOLCHAIN).setup)
-
-# compute NDK_APP_DEST as the destination directory for the generated files
-NDK_APP_DEST := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
-
-# free the dictionary of LOCAL_MODULE definitions
-$(call modules-clear)
-
-# now parse the Android.mk for the application
-include $(NDK_APP_BUILD_SCRIPT)
diff --git a/ndk/build/gmsl/README b/ndk/build/gmsl/README
deleted file mode 100644
index 152ada6..0000000
--- a/ndk/build/gmsl/README
+++ /dev/null
@@ -1,27 +0,0 @@
-GNU Make Standard Library
--------------------------
-
-1. Visit http://gmsl.sf.net for more details
-
-2. To use the GMSL in your Makefile make sure that you have the files
-
-   gmsl
-   __gmsl
-
-   Add 
-
-   include gmsl
-
-   to your Makefile(s).
-
-3. To run the GMSL test suite have 
-
-   gmsl
-   __gmsl
-   gmsl-tests
-
-   And then run
-
-   make -f gmsl-tests
-
- 
\ No newline at end of file
diff --git a/ndk/build/gmsl/__gmsl b/ndk/build/gmsl/__gmsl
deleted file mode 100644
index 596ff19..0000000
--- a/ndk/build/gmsl/__gmsl
+++ /dev/null
@@ -1,854 +0,0 @@
-# ----------------------------------------------------------------------------
-#
-# GNU Make Standard Library (GMSL)
-#
-# A library of functions to be used with GNU Make's $(call) that
-# provides functionality not available in standard GNU Make.
-#
-# Copyright (c) 2005-2007 John Graham-Cumming
-#
-# This file is part of GMSL
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 
-# Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# Neither the name of the John Graham-Cumming nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# ----------------------------------------------------------------------------
-
-# This is the GNU Make Standard Library version number as a list with
-# three items: major, minor, revision
-
-gmsl_version := 1 0 11
-
-# Used to output warnings and error from the library, it's possible to
-# disable any warnings or errors by overriding these definitions
-# manually or by setting GMSL_NO_WARNINGS or GMSL_NO_ERRORS
-
-__gmsl_name := GNU Make Standard Library
-__gmsl_warning = $(warning $(__gmsl_name): $1)
-__gmsl_error = $(error $(__gmsl_name): $1)
-
-ifdef GMSL_NO_WARNINGS
-__gmsl_warning :=
-endif
-ifdef GMSL_NO_ERRORS
-__gmsl_error :=
-endif
-
-# If GMSL_TRACE is enabled then calls to the library functions are
-# traced to stdout using warning messages with their arguments
-
-ifdef GMSL_TRACE
-__gmsl_tr1 = $(warning $0('$1'))
-__gmsl_tr2 = $(warning $0('$1','$2'))
-__gmsl_tr3 = $(warning $0('$1','$2','$3'))
-else
-__gmsl_tr1 :=
-__gmsl_tr2 :=
-__gmsl_tr3 :=
-endif
-
-# Figure out whether we have $(eval) or not (GNU Make 3.80 and above)
-# if we do not then output a warning message, if we do then some
-# functions will be enabled.
-
-__gmsl_have_eval := $(false)
-__gmsl_ignore := $(eval __gmsl_have_eval := $(true))
-
-# If this is being run with Electric Cloud's emake then warn that
-# their $(eval) support is incomplete.
-
-ifdef ECLOUD_BUILD_ID
-$(warning You are using Electric Cloud's emake which has incomplete $$(eval) support)
-__gmsl_have_eval := $(false)
-endif
-
-# See if we have $(lastword) (GNU Make 3.81 and above)
-
-__gmsl_have_lastword := $(lastword $(false) $(true))
-
-# See if we have native or and and (GNU Make 3.81 and above)
-
-__gmsl_have_or := $(if $(filter-out undefined,  \
-    $(origin or)),$(call or,$(true),$(false)))
-__gmsl_have_and := $(if $(filter-out undefined, \
-    $(origin and)),$(call and,$(true),$(true)))
-
-ifneq ($(__gmsl_have_eval),$(true))
-$(call __gmsl_warning,GNU Make $(MAKE_VERSION) does not support $$$$(eval): some functions disabled)
-endif
-
-# ----------------------------------------------------------------------------
-# Function:  gmsl_compatible
-# Arguments: List containing the desired library version number (maj min rev)
-# Returns:   $(true) if this version of the library is compatible
-#            with the requested version number, otherwise $(false)
-# ----------------------------------------------------------------------------
-gmsl_compatible = $(strip                                                 \
-    $(if $(call gt,$(word 1,$1),$(word 1,$(gmsl_version))),               \
-        $(false),                                                         \
-        $(if $(call lt,$(word 1,$1),$(word 1,$(gmsl_version))),           \
-            $(true),                                                      \
-            $(if $(call gt,$(word 2,$1),$(word 2,$(gmsl_version))),       \
-                $(false),                                                 \
-                $(if $(call lt,$(word 2,$1),$(word 2,$(gmsl_version))),   \
-                    $(true),                                              \
-                    $(call lte,$(word 3,$1),$(word 3,$(gmsl_version))))))))
-
-# ###########################################################################
-# LOGICAL OPERATORS
-# ###########################################################################
-
-# not is defined in gmsl
-
-# ----------------------------------------------------------------------------
-# Function:  and
-# Arguments: Two boolean values
-# Returns:   Returns $(true) if both of the booleans are true
-# ----------------------------------------------------------------------------
-ifneq ($(__gmsl_have_and),$(true))
-and = $(__gmsl_tr2)$(if $1,$(if $2,$(true),$(false)),$(false))
-endif
-
-# ----------------------------------------------------------------------------
-# Function:  or
-# Arguments: Two boolean values
-# Returns:   Returns $(true) if either of the booleans is true
-# ----------------------------------------------------------------------------
-ifneq ($(__gmsl_have_or),$(true))
-or = $(__gmsl_tr2)$(if $1$2,$(true),$(false))
-endif
-
-# ----------------------------------------------------------------------------
-# Function:  xor
-# Arguments: Two boolean values
-# Returns:   Returns $(true) if exactly one of the booleans is true
-# ----------------------------------------------------------------------------
-xor = $(__gmsl_tr2)$(if $1,$(if $2,$(false),$(true)),$(if $2,$(true),$(false)))
-
-# ----------------------------------------------------------------------------
-# Function:  nand
-# Arguments: Two boolean values
-# Returns:   Returns value of 'not and'
-# ----------------------------------------------------------------------------
-nand = $(__gmsl_tr2)$(if $1,$(if $2,$(false),$(true)),$(true))
-
-# ----------------------------------------------------------------------------
-# Function:  nor
-# Arguments: Two boolean values
-# Returns:   Returns value of 'not or'
-# ----------------------------------------------------------------------------
-nor = $(__gmsl_tr2)$(if $1$2,$(false),$(true))
-
-# ----------------------------------------------------------------------------
-# Function:  xnor
-# Arguments: Two boolean values
-# Returns:   Returns value of 'not xor'
-# ----------------------------------------------------------------------------
-xnor =$(__gmsl_tr2)$(if $1,$(if $2,$(true),$(false)),$(if $2,$(false),$(true)))
-
-# ###########################################################################
-# LIST MANIPULATION FUNCTIONS
-# ###########################################################################
-
-# ----------------------------------------------------------------------------
-# Function:  first (same as LISP's car, or head)
-# Arguments: 1: A list
-# Returns:   Returns the first element of a list
-# ----------------------------------------------------------------------------
-first = $(__gmsl_tr1)$(firstword $1)
-
-# ----------------------------------------------------------------------------
-# Function:  last
-# Arguments: 1: A list
-# Returns:   Returns the last element of a list
-# ----------------------------------------------------------------------------
-ifeq ($(__gmsl_have_lastword),$(true))
-last = $(__gmsl_tr1)$(lastword $1)
-else
-last = $(__gmsl_tr1)$(if $1,$(word $(words $1),$1))
-endif
-
-# ----------------------------------------------------------------------------
-# Function:  rest (same as LISP's cdr, or tail)
-# Arguments: 1: A list
-# Returns:   Returns the list with the first element removed
-# ----------------------------------------------------------------------------
-rest = $(__gmsl_tr1)$(wordlist 2,$(words $1),$1)
-
-# ----------------------------------------------------------------------------
-# Function:  chop
-# Arguments: 1: A list
-# Returns:   Returns the list with the last element removed
-# ----------------------------------------------------------------------------
-chop = $(__gmsl_tr1)$(wordlist 2,$(words $1),x $1)
-
-# ----------------------------------------------------------------------------
-# Function:  map
-# Arguments: 1: Name of function to $(call) for each element of list
-#            2: List to iterate over calling the function in 1
-# Returns:   The list after calling the function on each element
-# ----------------------------------------------------------------------------
-map = $(__gmsl_tr2)$(strip $(foreach a,$2,$(call $1,$a)))
-
-# ----------------------------------------------------------------------------
-# Function:  pairmap
-# Arguments: 1: Name of function to $(call) for each pair of elements
-#            2: List to iterate over calling the function in 1
-#            3: Second list to iterate over calling the function in 1
-# Returns:   The list after calling the function on each pair of elements
-# ----------------------------------------------------------------------------
-pairmap = $(strip $(__gmsl_tr3)\
-          $(if $2$3,$(call $1,$(call first,$2),$(call first,$3))     \
-                        $(call pairmap,$1,$(call rest,$2),$(call rest,$3))))
-
-# ----------------------------------------------------------------------------
-# Function:  leq
-# Arguments: 1: A list to compare against...
-#            2: ...this list
-# Returns:   Returns $(true) if the two lists are identical
-# ----------------------------------------------------------------------------
-leq = $(__gmsl_tr2)$(strip $(if $(call seq,$(words $1),$(words $2)),     \
-          $(call __gmsl_list_equal,$1,$2),$(false)))
-
-__gmsl_list_equal = $(if $(strip $1),                                       \
-                        $(if $(call seq,$(call first,$1),$(call first,$2)), \
-                            $(call __gmsl_list_equal,                       \
-                                $(call rest,$1),                            \
-                                $(call rest,$2)),                           \
-                            $(false)),                                      \
-                     $(true))
-
-# ----------------------------------------------------------------------------
-# Function:  lne
-# Arguments: 1: A list to compare against...
-#            2: ...this list
-# Returns:   Returns $(true) if the two lists are different
-# ----------------------------------------------------------------------------
-lne = $(__gmsl_tr2)$(call not,$(call leq,$1,$2))
-
-# ----------------------------------------------------------------------------
-# Function:  reverse
-# Arguments: 1: A list to reverse
-# Returns:   The list with its elements in reverse order
-# ----------------------------------------------------------------------------
-reverse =$(__gmsl_tr1)$(strip $(if $1,$(call reverse,$(call rest,$1)) \
-                        $(call first,$1)))
-
-# ----------------------------------------------------------------------------
-# Function:  uniq
-# Arguments: 1: A list from which to remove repeated elements
-# Returns:   The list with duplicate elements removed without reordering
-# ----------------------------------------------------------------------------
-uniq = $(strip $(__gmsl_tr1)$(if $1,$(call uniq,$(call chop,$1)) \
-            $(if $(filter $(call last,$1),$(call chop,$1)),,$(call last,$1))))
-
-# ----------------------------------------------------------------------------
-# Function:  length
-# Arguments: 1: A list
-# Returns:   The number of elements in the list
-# ----------------------------------------------------------------------------
-length = $(__gmsl_tr1)$(words $1)
-
-# ###########################################################################
-# STRING MANIPULATION FUNCTIONS
-# ###########################################################################
-
-# Helper function that translates any GNU Make 'true' value (i.e. a
-# non-empty string) to our $(true)
-
-__gmsl_make_bool = $(if $(strip $1),$(true),$(false))
-
-# ----------------------------------------------------------------------------
-# Function:  seq
-# Arguments: 1: A string to compare against...
-#            2: ...this string
-# Returns:   Returns $(true) if the two strings are identical
-# ----------------------------------------------------------------------------
-seq = $(__gmsl_tr2)$(if $(filter-out xx,x$(subst $1,,$2)$(subst $2,,$1)x),$(false),$(true))
-
-# ----------------------------------------------------------------------------
-# Function:  sne
-# Arguments: 1: A string to compare against...
-#            2: ...this string
-# Returns:   Returns $(true) if the two strings are not the same
-# ----------------------------------------------------------------------------
-sne = $(__gmsl_tr2)$(call not,$(call seq,$1,$2))
-
-# ----------------------------------------------------------------------------
-# Function:  split
-# Arguments: 1: The character to split on
-#            2: A string to split
-# Returns:   Splits a string into a list separated by spaces at the split
-#            character in the first argument
-# ----------------------------------------------------------------------------
-split = $(__gmsl_tr2)$(strip $(subst $1, ,$2))
-
-# ----------------------------------------------------------------------------
-# Function:  merge
-# Arguments: 1: The character to put between fields
-#            2: A list to merge into a string
-# Returns:   Merges a list into a single string, list elements are separated
-#            by the character in the first argument
-# ----------------------------------------------------------------------------
-merge = $(__gmsl_tr2)$(strip $(if $2,                                     \
-            $(if $(call seq,1,$(words $2)),                               \
-                $2,$(call first,$2)$1$(call merge,$1,$(call rest,$2)))))
-
-ifdef __gmsl_have_eval
-# ----------------------------------------------------------------------------
-# Function:  tr
-# Arguments: 1: The list of characters to translate from 
-#            2: The list of characters to translate to
-#            3: The text to translate
-# Returns:   Returns the text after translating characters
-# ----------------------------------------------------------------------------
-tr = $(strip $(__gmsl_tr3)$(call assert_no_dollar,$0,$1$2$3)              \
-     $(eval __gmsl_t := $3)                                               \
-     $(foreach c,                                                         \
-         $(join $(addsuffix :,$1),$2),                                    \
-         $(eval __gmsl_t :=                                               \
-             $(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)), \
-                 $(__gmsl_t))))$(__gmsl_t))
-
-# Common character classes for use with the tr function.  Each of
-# these is actually a variable declaration and must be wrapped with
-# $() or ${} to be used.
-
-[A-Z] := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z #
-[a-z] := a b c d e f g h i j k l m n o p q r s t u v w x y z #
-[0-9] := 0 1 2 3 4 5 6 7 8 9 #
-[A-F] := A B C D E F #
-
-# ----------------------------------------------------------------------------
-# Function:  uc
-# Arguments: 1: Text to upper case
-# Returns:   Returns the text in upper case
-# ----------------------------------------------------------------------------
-uc = $(__gmsl_tr1)$(call assert_no_dollar,$0,$1)$(call tr,$([a-z]),$([A-Z]),$1)
-
-# ----------------------------------------------------------------------------
-# Function:  lc
-# Arguments: 1: Text to lower case
-# Returns:   Returns the text in lower case
-# ----------------------------------------------------------------------------
-lc = $(__gmsl_tr1)$(call assert_no_dollar,$0,$1)$(call tr,$([A-Z]),$([a-z]),$1)
-
-# ----------------------------------------------------------------------------
-# Function:  strlen
-# Arguments: 1: A string
-# Returns:   Returns the length of the string
-# ----------------------------------------------------------------------------
-__gmsl_characters := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
-__gmsl_characters += a b c d e f g h i j k l m n o p q r s t u v w x y z
-__gmsl_characters += 0 1 2 3 4 5 6 7 8 9
-__gmsl_characters += ` ~ ! @ \# $$ % ^ & * ( ) - _ = +
-__gmsl_characters += { } [ ] \ : ; ' " < > , . / ? |
-
-# Aside: if you read the above you might think that the lower-case
-# letter x is missing, and that that's an error.  It is missing, but
-# it's not an error.  __gmsl_characters is used by the strlen
-# function.  strlen works by transforming every character and space
-# into the letter x and then counting the x's.  Since there's no need
-# to transform x into x I omitted it.
-
-# This results in __gmsl_space containing just a space
-
-__gmsl_space := 
-__gmsl_space +=
-
-strlen = $(__gmsl_tr1)$(call assert_no_dollar,$0,$1)$(strip $(eval __temp := $(subst $(__gmsl_space),x,$1))$(foreach a,$(__gmsl_characters),$(eval __temp := $$(subst $$a,x,$(__temp))))$(eval __temp := $(subst x,x ,$(__temp)))$(words $(__temp)))
-
-# This results in __gmsl_newline containing just a newline
-
-define __gmsl_newline
-
-
-endef
-
-# This results in __gmsl_tab containing a tab
-
-__gmsl_tab :=	#
-
-# ----------------------------------------------------------------------------
-# Function:  substr
-# Arguments: 1: A string
-# 	     2: Start position (first character is 1)
-#	     3: End position (inclusive)
-# Returns:   A substring.  
-# Note:      The string in $1 must not contain a §
-# ----------------------------------------------------------------------------
-
-substr = $(__gmsl_tr3)$(call assert_no_dollar,$0,$1$2$3)$(strip $(eval __temp := $$(subst $$(__gmsl_space),§ ,$$1))$(foreach a,$(__gmsl_characters),$(eval __temp := $$(subst $$a,$$a$$(__gmsl_space),$(__temp))))$(eval __temp := $(wordlist $2,$3,$(__temp))))$(subst §,$(__gmsl_space),$(subst $(__gmsl_space),,$(__temp)))
-
-endif # __gmsl_have_eval
-
-# ###########################################################################
-# SET MANIPULATION FUNCTIONS
-# ###########################################################################
-
-# Sets are represented by sorted, deduplicated lists.  To create a set
-# from a list use set_create, or start with the empty_set and
-# set_insert individual elements
-
-# This is the empty set
-empty_set := 
-
-# ----------------------------------------------------------------------------
-# Function:  set_create
-# Arguments: 1: A list of set elements
-# Returns:   Returns the newly created set
-# ----------------------------------------------------------------------------
-set_create = $(__gmsl_tr1)$(sort $1)
-
-# ----------------------------------------------------------------------------
-# Function:  set_insert
-# Arguments: 1: A single element to add to a set
-#            2: A set
-# Returns:   Returns the set with the element added
-# ----------------------------------------------------------------------------
-set_insert = $(__gmsl_tr2)$(sort $1 $2)
-
-# ----------------------------------------------------------------------------
-# Function:  set_remove
-# Arguments: 1: A single element to remove from a set
-#            2: A set
-# Returns:   Returns the set with the element removed
-# ----------------------------------------------------------------------------
-set_remove = $(__gmsl_tr2)$(filter-out $1,$2)
-
-# ----------------------------------------------------------------------------
-# Function:  set_is_member
-# Arguments: 1: A single element 
-#            2: A set
-# Returns:   Returns $(true) if the element is in the set
-# ----------------------------------------------------------------------------
-set_is_member = $(__gmsl_tr2)$(if $(filter $1,$2),$(true),$(false))
-
-# ----------------------------------------------------------------------------
-# Function:  set_union
-# Arguments: 1: A set
-#            2: Another set
-# Returns:   Returns the union of the two sets
-# ----------------------------------------------------------------------------
-set_union = $(__gmsl_tr2)$(sort $1 $2)
-
-# ----------------------------------------------------------------------------
-# Function:  set_intersection
-# Arguments: 1: A set
-#            2: Another set
-# Returns:   Returns the intersection of the two sets
-# ----------------------------------------------------------------------------
-set_intersection = $(__gmsl_tr2)$(filter $1,$2)
-
-# ----------------------------------------------------------------------------
-# Function:  set_is_subset
-# Arguments: 1: A set
-#            2: Another set
-# Returns:   Returns $(true) if the first set is a subset of the second
-# ----------------------------------------------------------------------------
-set_is_subset = $(__gmsl_tr2)$(call set_equal,$(call set_intersection,$1,$2),$1)
-
-# ----------------------------------------------------------------------------
-# Function:  set_equal
-# Arguments: 1: A set
-#            2: Another set
-# Returns:   Returns $(true) if the two sets are identical
-# ----------------------------------------------------------------------------
-set_equal = $(__gmsl_tr2)$(call seq,$1,$2)
-
-# ###########################################################################
-# ARITHMETIC LIBRARY
-# ###########################################################################
-
-# Integers a represented by lists with the equivalent number of x's.
-# For example the number 4 is x x x x.  The maximum integer that the
-# library can handle as _input_ is __gmsl_input_int which is defined
-# here as 65536
-
-__gmsl_sixteen := x x x x x x x x x x x x x x x x
-__gmsl_input_int := $(foreach a,$(__gmsl_sixteen),         \
-                        $(foreach b,$(__gmsl_sixteen),     \
-                            $(foreach c,$(__gmsl_sixteen), \
-                                $(__gmsl_sixteen)))))
-
-# ----------------------------------------------------------------------------
-# Function:  int_decode
-# Arguments: 1: A number of x's representation
-# Returns:   Returns the integer for human consumption that is represented
-#            by the string of x's
-# ----------------------------------------------------------------------------
-int_decode = $(__gmsl_tr1)$(words $1)
-
-# ----------------------------------------------------------------------------
-# Function:  int_encode
-# Arguments: 1: A number in human-readable integer form
-# Returns:   Returns the integer encoded as a string of x's
-# ----------------------------------------------------------------------------
-int_encode = $(__gmsl_tr1)$(wordlist 1,$1,$(__gmsl_input_int))
-
-# The arithmetic library functions come in two forms: one form of each
-# function takes integers as arguments and the other form takes the
-# encoded form (x's created by a call to int_encode).  For example,
-# there are two plus functions:
-#
-# plus        Called with integer arguments and returns an integer
-# int_plus    Called with encoded arguments and returns an encoded result
-#
-# plus will be slower than int_plus because its arguments and result
-# have to be translated between the x's format and integers.  If doing
-# a complex calculation use the int_* forms with a single encoding of
-# inputs and single decoding of the output.  For simple calculations
-# the direct forms can be used.
-
-# Helper function used to wrap an int_* function into a function that
-# takes a pair of integers, perhaps a function and returns an integer
-# result
-__gmsl_int_wrap = $(call int_decode,$(call $1,$(call int_encode,$2),$(call int_encode,$3)))
-__gmsl_int_wrap1 = $(call int_decode,$(call $1,$(call int_encode,$2)))
-__gmsl_int_wrap2 = $(call $1,$(call int_encode,$2),$(call int_encode,$3))
-
-# ----------------------------------------------------------------------------
-# Function:  int_plus
-# Arguments: 1: A number in x's representation
-#            2: Another number in x's represntation
-# Returns:   Returns the sum of the two numbers in x's representation
-# ----------------------------------------------------------------------------
-int_plus = $(strip $(__gmsl_tr2)$1 $2)
-
-# ----------------------------------------------------------------------------
-# Function:  plus (wrapped version of int_plus)
-# Arguments: 1: An integer
-#            2: Another integer
-# Returns:   Returns the sum of the two integers
-# ----------------------------------------------------------------------------
-plus = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_plus,$1,$2)
-
-# ----------------------------------------------------------------------------
-# Function:  int_subtract
-# Arguments: 1: A number in x's representation
-#            2: Another number in x's represntation
-# Returns:   Returns the difference of the two numbers in x's representation,
-#            or outputs an error on a numeric underflow
-# ----------------------------------------------------------------------------
-int_subtract = $(strip $(__gmsl_tr2)$(if $(call int_gte,$1,$2), \
-                $(filter-out xx,$(join $1,$2)),                 \
-                $(call __gmsl_warning,Subtraction underflow)))
-
-# ----------------------------------------------------------------------------
-# Function:  subtract (wrapped version of int_subtract)
-# Arguments: 1: An integer
-#            2: Another integer
-# Returns:   Returns the difference of the two integers,
-#            or outputs an error on a numeric underflow
-# ----------------------------------------------------------------------------
-subtract = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_subtract,$1,$2)
-
-# ----------------------------------------------------------------------------
-# Function:  int_multiply
-# Arguments: 1: A number in x's representation
-#            2: Another number in x's represntation
-# Returns:   Returns the product of the two numbers in x's representation
-# ----------------------------------------------------------------------------
-int_multiply = $(strip $(__gmsl_tr2)$(foreach a,$1,$2))
-
-# ----------------------------------------------------------------------------
-# Function:  multiply (wrapped version of int_multiply)
-# Arguments: 1: An integer
-#            2: Another integer
-# Returns:   Returns the product of the two integers
-# ----------------------------------------------------------------------------
-multiply = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_multiply,$1,$2)
-
-# ----------------------------------------------------------------------------
-# Function:  int_divide
-# Arguments: 1: A number in x's representation
-#            2: Another number in x's represntation
-# Returns:   Returns the result of integer division of argument 1 divided
-#            by argument 2 in x's representation
-# ----------------------------------------------------------------------------
-int_divide = $(__gmsl_tr2)$(strip $(if $2,                                 \
-                 $(if $(call int_gte,$1,$2),                               \
-                     x $(call int_divide,$(call int_subtract,$1,$2),$2),), \
-                 $(call __gmsl_error,Division by zero)))
-
-# ----------------------------------------------------------------------------
-# Function:  divide (wrapped version of int_divide)
-# Arguments: 1: An integer
-#            2: Another integer
-# Returns:   Returns the integer division of the first argument by the second
-# ----------------------------------------------------------------------------
-divide = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_divide,$1,$2)
-
-# ----------------------------------------------------------------------------
-# Function:  int_max, int_min
-# Arguments: 1: A number in x's representation
-#            2: Another number in x's represntation
-# Returns:   Returns the maximum or minimum of its arguments in x's
-#            representation
-# ----------------------------------------------------------------------------
-int_max = $(__gmsl_tr2)$(subst xx,x,$(join $1,$2))
-int_min = $(__gmsl_tr2)$(subst xx,x,$(filter xx,$(join $1,$2)))
-
-# ----------------------------------------------------------------------------
-# Function:  max, min
-# Arguments: 1: An integer
-#            2: Another integer
-# Returns:   Returns the maximum or minimum of its integer arguments
-# ----------------------------------------------------------------------------
-max = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_max,$1,$2)
-min = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_min,$1,$2)
-
-# ----------------------------------------------------------------------------
-# Function: int_gt, int_gte, int_lt, int_lte, int_eq, int_ne
-# Arguments: Two x's representation numbers to be compared
-# Returns:   $(true) or $(false)
-#
-# int_gt    First argument greater than second argument
-# int_gte   First argument greater than or equal to second argument
-# int_lt    First argument less than second argument 
-# int_lte   First argument less than or equal to second argument
-# int_eq    First argument is numerically equal to the second argument
-# int_ne    First argument is not numerically equal to the second argument
-# ----------------------------------------------------------------------------
-int_gt = $(__gmsl_tr2)$(call __gmsl_make_bool,      \
-                          $(filter-out $(words $2), \
-                              $(words $(call int_max,$1,$2))))
-int_gte = $(__gmsl_tr2)$(call __gmsl_make_bool,     \
-                           $(call int_gt,$1,$2)$(call int_eq,$1,$2))
-int_lt = $(__gmsl_tr2)$(call __gmsl_make_bool,      \
-                          $(filter-out $(words $1), \
-                              $(words $(call int_max,$1,$2))))
-int_lte = $(__gmsl_tr2)$(call __gmsl_make_bool,     \
-                           $(call int_lt,$1,$2)$(call int_eq,$1,$2))
-int_eq = $(__gmsl_tr2)$(call __gmsl_make_bool,      \
-                          $(filter $(words $1),$(words $2)))
-int_ne = $(__gmsl_tr2)$(call __gmsl_make_bool,      \
-                          $(filter-out $(words $1),$(words $2)))
-
-# ----------------------------------------------------------------------------
-# Function: gt, gte, lt, lte, eq, ne
-# Arguments: Two integers to be compared
-# Returns:   $(true) or $(false)
-#
-# gt    First argument greater than second argument
-# gte   First argument greater than or equal to second argument
-# lt    First argument less than second argument 
-# lte   First argument less than or equal to second argument
-# eq    First argument is numerically equal to the second argument
-# ne    First argument is not numerically equal to the second argument
-# ----------------------------------------------------------------------------
-gt = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_gt,$1,$2)
-gte = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_gte,$1,$2)
-lt = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_lt,$1,$2)
-lte = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_lte,$1,$2)
-eq = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_eq,$1,$2)
-ne = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_ne,$1,$2)
-
-# increment adds 1 to its argument, decrement subtracts 1.  Note that
-# decrement does not range check and hence will not underflow, but
-# will incorrectly say that 0 - 1 = 0
-
-# ----------------------------------------------------------------------------
-# Function:  int_inc
-# Arguments: 1: A number in x's representation
-# Returns:   The number incremented by 1 in x's representation
-# ----------------------------------------------------------------------------
-int_inc = $(strip $(__gmsl_tr1)$1 x)
-
-# ----------------------------------------------------------------------------
-# Function:  inc
-# Arguments: 1: An integer
-# Returns:   The argument incremented by 1
-# ----------------------------------------------------------------------------
-inc = $(__gmsl_tr1)$(call __gmsl_int_wrap1,int_inc,$1)
-
-# ----------------------------------------------------------------------------
-# Function:  int_dec
-# Arguments: 1: A number in x's representation
-# Returns:   The number decremented by 1 in x's representation
-# ----------------------------------------------------------------------------
-int_dec = $(__gmsl_tr1)$(strip $(if $(call sne,0,$(words $1)), \
-              $(wordlist 2,$(words $1),$1),                    \
-              $(call __gmsl_warning,Decrement underflow)))
-
-# ----------------------------------------------------------------------------
-# Function:  dec
-# Arguments: 1: An integer
-# Returns:   The argument decremented by 1
-# ----------------------------------------------------------------------------
-dec = $(__gmsl_tr1)$(call __gmsl_int_wrap1,int_dec,$1)
-
-# double doubles its argument, and halve halves it
-
-# ----------------------------------------------------------------------------
-# Function:  int_double
-# Arguments: 1: A number in x's representation
-# Returns:   The number doubled (i.e. * 2) and returned in x's representation
-# ----------------------------------------------------------------------------
-int_double = $(strip $(__gmsl_tr1)$1 $1)
-
-# ----------------------------------------------------------------------------
-# Function:  double
-# Arguments: 1: An integer
-# Returns:   The integer times 2
-# ----------------------------------------------------------------------------
-double = $(__gmsl_tr1)$(call __gmsl_int_wrap1,int_double,$1)
-
-# ----------------------------------------------------------------------------
-# Function:  int_halve
-# Arguments: 1: A number in x's representation
-# Returns:   The number halved (i.e. / 2) and returned in x's representation
-# ----------------------------------------------------------------------------
-int_halve = $(__gmsl_tr1)$(strip $(subst xx,x,$(filter-out xy x y, \
-                             $(join $1,$(foreach a,$1,y x)))))
-
-# ----------------------------------------------------------------------------
-# Function:  halve
-# Arguments: 1: An integer
-# Returns:   The integer divided by 2
-# ----------------------------------------------------------------------------
-halve = $(__gmsl_tr1)$(call __gmsl_int_wrap1,int_halve,$1)
-
-ifdef __gmsl_have_eval
-# ###########################################################################
-# ASSOCIATIVE ARRAYS
-# ###########################################################################
-
-# ----------------------------------------------------------------------------
-# Function:  set
-# Arguments: 1: Name of associative array
-#            2: The key value to associate
-#            3: The value associated with the key
-# Returns:   None
-# ----------------------------------------------------------------------------
-set = $(__gmsl_tr3)$(call assert_no_dollar,$0,$1$2$3)$(eval __gmsl_aa_$1_$2 = $3)
-
-# ----------------------------------------------------------------------------
-# Function:  get
-# Arguments: 1: Name of associative array
-#            2: The key to retrieve
-# Returns:   The value stored in the array for that key
-# ----------------------------------------------------------------------------
-get = $(strip $(__gmsl_tr2)$(call assert_no_dollar,$0,$1$2)$(if $(filter-out undefined,$(origin __gmsl_aa_$1_$2)), \
-    $(__gmsl_aa_$1_$2)))
-
-# ----------------------------------------------------------------------------
-# Function:  keys
-# Arguments: 1: Name of associative array
-# Returns:   Returns a list of all defined keys in the array
-# ----------------------------------------------------------------------------
-keys = $(__gmsl_tr1)$(call assert_no_dollar,$0,$1)$(sort $(patsubst __gmsl_aa_$1_%,%, \
-                  $(filter __gmsl_aa_$1_%,$(.VARIABLES))))
-
-# ----------------------------------------------------------------------------
-# Function:  defined
-# Arguments: 1: Name of associative array
-#            2: The key to test
-# Returns:   Returns true if the key is defined (i.e. not empty)
-# ----------------------------------------------------------------------------
-defined = $(__gmsl_tr2)$(call assert_no_dollar,$0,$1$2)$(call sne,$(call get,$1,$2),)
-
-endif # __gmsl_have_eval
-
-ifdef __gmsl_have_eval
-# ###########################################################################
-# NAMED STACKS
-# ###########################################################################
-
-# ----------------------------------------------------------------------------
-# Function:  push
-# Arguments: 1: Name of stack
-#            2: Value to push onto the top of the stack (must not contain
-#               a space)
-# Returns:   None
-# ----------------------------------------------------------------------------
-push = $(__gmsl_tr2)$(call assert_no_dollar,$0,$1$2)$(eval __gmsl_stack_$1 := $2 $(if $(filter-out undefined,\
-    $(origin __gmsl_stack_$1)),$(__gmsl_stack_$1)))
-
-# ----------------------------------------------------------------------------
-# Function:  pop
-# Arguments: 1: Name of stack
-# Returns:   Top element from the stack after removing it
-# ----------------------------------------------------------------------------
-pop = $(__gmsl_tr1)$(call assert_no_dollar,$0,$1)$(strip $(if $(filter-out undefined,$(origin __gmsl_stack_$1)), \
-    $(call first,$(__gmsl_stack_$1))                                       \
-    $(eval __gmsl_stack_$1 := $(call rest,$(__gmsl_stack_$1)))))
-
-# ----------------------------------------------------------------------------
-# Function:  peek
-# Arguments: 1: Name of stack
-# Returns:   Top element from the stack without removing it
-# ----------------------------------------------------------------------------
-peek = $(__gmsl_tr1)$(call assert_no_dollar,$0,$1)$(call first,$(__gmsl_stack_$1))
-
-# ----------------------------------------------------------------------------
-# Function:  depth
-# Arguments: 1: Name of stack
-# Returns:   Number of items on the stack
-# ----------------------------------------------------------------------------
-depth = $(__gmsl_tr1)$(call assert_no_dollar,$0,$1)$(words $(__gmsl_stack_$1))
-
-endif # __gmsl_have_eval
-
-# ###########################################################################
-# DEBUGGING FACILITIES
-# ###########################################################################
-
-# ----------------------------------------------------------------------------
-# Target:    gmsl-print-%
-# Arguments: The % should be replaced by the name of a variable that you
-#            wish to print out.
-# Action:    Echos the name of the variable that matches the % and its value.
-#            For example, 'make gmsl-print-SHELL' will output the value of
-#            the SHELL variable
-# ----------------------------------------------------------------------------
-gmsl-print-%: ; @echo $* = $($*)
-
-# ----------------------------------------------------------------------------
-# Function:  assert
-# Arguments: 1: A boolean that must be true or the assertion will fail
-#            2: The message to print with the assertion
-# Returns:   None
-# ----------------------------------------------------------------------------
-assert = $(if $1,,$(call __gmsl_error,Assertion failure: $2))
-
-# ----------------------------------------------------------------------------
-# Function:  assert_exists
-# Arguments: 1: Name of file that must exist, if it is missing an assertion
-#               will be generated
-# Returns:   None
-# ----------------------------------------------------------------------------
-assert_exists = $(call assert,$(wildcard $1),file '$1' missing)
-
-# ----------------------------------------------------------------------------
-# Function:  assert_no_dollar
-# Arguments: 1: Name of a function being executd
-#            2: Arguments to check
-# Returns:   None
-# ----------------------------------------------------------------------------
-assert_no_dollar = $(call assert,$(call not,$(findstring $$,$2)),$1 called with a dollar sign in argument)
diff --git a/ndk/build/gmsl/gmsl b/ndk/build/gmsl/gmsl
deleted file mode 100644
index 2ff2897..0000000
--- a/ndk/build/gmsl/gmsl
+++ /dev/null
@@ -1,89 +0,0 @@
-# ----------------------------------------------------------------------------
-#
-# GNU Make Standard Library (GMSL)
-#
-# A library of functions to be used with GNU Make's $(call) that
-# provides functionality not available in standard GNU Make.
-#
-# Copyright (c) 2005-2008 John Graham-Cumming
-#
-# This file is part of GMSL
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 
-# Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# Neither the name of the John Graham-Cumming nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# ----------------------------------------------------------------------------
-
-# Determine if the library has already been included and if so don't
-# bother including it again
-
-ifndef __gmsl_included
-
-# Standard definitions for true and false.  true is any non-empty
-# string, false is an empty string. These are intended for use with
-# $(if).
-
-true  := T
-false :=
-
-# ----------------------------------------------------------------------------
-# Function:  not
-# Arguments: 1: A boolean value
-# Returns:   Returns the opposite of the arg. (true -> false, false -> true)
-# ----------------------------------------------------------------------------
-not = $(if $1,$(false),$(true))
-
-# Prevent reinclusion of the library
-
-__gmsl_included := $(true)
-
-# Try to determine where this file is located.  If the caller did
-# include /foo/gmsl then extract the /foo/ so that __gmsl gets
-# included transparently
-
-ifneq ($(MAKEFILE_LIST),)
-__gmsl_root := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
-
-# If there are any spaces in the path in __gmsl_root then give up
-
-ifeq (1,$(words $(__gmsl_root)))
-__gmsl_root := $(patsubst %gmsl,%,$(__gmsl_root))
-else
-__gmsl_root :=
-endif
-
-include $(__gmsl_root)__gmsl
-
-else
-
-include __gmsl
-
-endif
-
-endif # __gmsl_included
-
diff --git a/ndk/build/gmsl/gmsl-tests b/ndk/build/gmsl/gmsl-tests
deleted file mode 100644
index b205be6..0000000
--- a/ndk/build/gmsl/gmsl-tests
+++ /dev/null
@@ -1,647 +0,0 @@
-# ----------------------------------------------------------------------------
-#
-# GNU Make Standard Library (GMSL) Test Suite
-#
-# Test suite for the GMSL
-#
-# Copyright (c) 2005-2007 John Graham-Cumming
-#
-# This file is part of GMSL
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 
-# Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# Neither the name of the John Graham-Cumming nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# ----------------------------------------------------------------------------
-
-.PHONY: all
-all:
-	@echo
-	@echo Test Summary
-	@echo ------------
-	@echo "$(call int_decode,$(passed)) tests passed; $(call int_decode,$(failed)) tests failed"
-
-include gmsl
-
-passed :=
-failed :=
-
-ECHO := /bin/echo
-
-start_test = $(shell $(ECHO) -n "Testing '$1': " >&2)$(eval current_test := OK)
-stop_test  = $(shell $(ECHO) " $(current_test)" >&2)
-test_pass = .$(eval passed := $(call int_inc,$(passed)))
-test_fail = X$(eval failed := $(call int_inc,$(failed)))$(eval current_test := ERROR '$1' != '$2')
-test_assert = $(if $(filter undefined,$(origin 2)),$(eval 2 :=))$(shell $(ECHO) -n $(if $(call seq,$1,$2),$(call test_pass,$1,$2),$(call test_fail,$1,$2)) >&2)
-
-$(call start_test,not)
-$(call test_assert,$(call not,$(true)),$(false))
-$(call test_assert,$(call not,$(false)),$(true))
-$(call stop_test)
-
-$(call start_test,or)
-$(call test_assert,$(call or,$(true),$(true)),$(true))
-$(call test_assert,$(call or,$(true),$(false)),$(true))
-$(call test_assert,$(call or,$(false),$(true)),$(true))
-$(call test_assert,$(call or,$(false),$(false)),$(false))
-$(call stop_test)
-
-$(call start_test,and)
-$(call test_assert,$(call and,$(true),$(true)),$(true))
-$(call test_assert,$(call and,$(true),$(false)),$(false))
-$(call test_assert,$(call and,$(false),$(true)),$(false))
-$(call test_assert,$(call and,$(false),$(false)),$(false))
-$(call stop_test)
-
-$(call start_test,xor)
-$(call test_assert,$(call xor,$(true),$(true)),$(false))
-$(call test_assert,$(call xor,$(true),$(false)),$(true))
-$(call test_assert,$(call xor,$(false),$(true)),$(true))
-$(call test_assert,$(call xor,$(false),$(false)),$(false))
-$(call stop_test)
-
-$(call start_test,nand)
-$(call test_assert,$(call nand,$(true),$(true)),$(false))
-$(call test_assert,$(call nand,$(true),$(false)),$(true))
-$(call test_assert,$(call nand,$(false),$(true)),$(true))
-$(call test_assert,$(call nand,$(false),$(false)),$(true))
-$(call stop_test)
-
-$(call start_test,nor)
-$(call test_assert,$(call nor,$(true),$(true)),$(false))
-$(call test_assert,$(call nor,$(true),$(false)),$(false))
-$(call test_assert,$(call nor,$(false),$(true)),$(false))
-$(call test_assert,$(call nor,$(false),$(false)),$(true))
-$(call stop_test)
-
-$(call start_test,xnor)
-$(call test_assert,$(call xnor,$(true),$(true)),$(true))
-$(call test_assert,$(call xnor,$(true),$(false)),$(false))
-$(call test_assert,$(call xnor,$(false),$(true)),$(false))
-$(call test_assert,$(call xnor,$(false),$(false)),$(true))
-$(call stop_test)
-
-$(call start_test,first)
-$(call test_assert,$(call first,1 2 3),1)
-$(call test_assert,$(call first,1),1)
-$(call test_assert,$(call first,),)
-$(call stop_test)
-
-$(call start_test,last)
-$(call test_assert,$(call last,1 2 3),3)
-$(call test_assert,$(call last,1),1)
-$(call test_assert,$(call last,),)
-$(call stop_test)
-
-$(call start_test,rest)
-$(call test_assert,$(call rest,1 2 3),2 3)
-$(call test_assert,$(call rest,1),)
-$(call test_assert,$(call rest,),)
-$(call stop_test)
-
-$(call start_test,chop)
-$(call test_assert,$(call chop,1 2 3),1 2)
-$(call test_assert,$(call chop,1 2 3 4),1 2 3)
-$(call test_assert,$(call chop,1),)
-$(call test_assert,$(call chop,),)
-$(call stop_test)
-
-$(call start_test,length)
-$(call test_assert,$(call length,1 2 3),3)
-$(call test_assert,$(call length,1 2 3 4),4)
-$(call test_assert,$(call length,1),1)
-$(call test_assert,$(call length,),0)
-$(call stop_test)
-
-$(call start_test,map)
-$(call test_assert,$(call map,origin,__undefined map MAKE),undefined file default)
-$(call test_assert,$(call map,origin,),)
-$(call stop_test)
-
-joinem = $1$2
-$(call start_test,pairmap)
-$(call test_assert,$(call pairmap,addsuffix,2 1 3,a b c),a2 b1 c3)
-$(call test_assert,$(call pairmap,addprefix,2 1 3,a b c d),2a 1b 3c d)
-$(call test_assert,$(call pairmap,addprefix,2 1 3 4,a b c),2a 1b 3c)
-$(call test_assert,$(call pairmap,joinem,2 1 3 4,a b c),2a 1b 3c 4)
-$(call stop_test)
-
-$(call start_test,seq)
-$(call test_assert,$(call seq,abc,abc),T)
-$(call test_assert,$(call seq,x,),)
-$(call test_assert,$(call seq,,x),)
-$(call test_assert,$(call seq,x,x),T)
-$(call test_assert,$(call seq,a%c,abc),)
-$(call test_assert,$(call seq,abc,a%c),)
-$(call test_assert,$(call seq,abc,ABC),)
-$(call test_assert,$(call seq,abc,),)
-$(call test_assert,$(call seq,,),T)
-$(call test_assert,$(call seq,a b c,a b c),T)
-$(call test_assert,$(call seq,aa% bb% cc,aa% bb% cc),T)
-$(call test_assert,$(call seq,aa% bb% cc,aa% bb cc),)
-$(call test_assert,$(call seq,aa% bb% cc,xx yy zz),)
-$(call stop_test)
-
-$(call start_test,sne)
-$(call test_assert,$(call sne,abc,abc),)
-$(call test_assert,$(call sne,x,),T)
-$(call test_assert,$(call sne,,x),T)
-$(call test_assert,$(call sne,x,x),)
-$(call test_assert,$(call sne,abc,ABC),T)
-$(call test_assert,$(call sne,abc,),T)
-$(call test_assert,$(call sne,,),)
-$(call test_assert,$(call sne,a b c,a b c),)
-$(call test_assert,$(call sne,aa% bb% cc,aa% bb% cc),)
-$(call test_assert,$(call sne,aa% bb% cc,aa% bb cc),T)
-$(call stop_test)
-
-$(call start_test,strlen)
-$(call test_assert,$(call strlen,),0)
-$(call test_assert,$(call strlen,a),1)
-$(call test_assert,$(call strlen,a b),3)
-$(call test_assert,$(call strlen,a ),2)
-$(call test_assert,$(call strlen, a),2)
-$(call test_assert,$(call strlen,  ),2)
-$(call test_assert,$(call strlen,   ),3)
-$(call test_assert,$(call strlen,    ),4)
-$(call stop_test)
-
-$(call start_test,substr)
-$(call test_assert,$(call substr,xyz,1,1),x)
-$(call test_assert,$(call substr,xyz,1,2),xy)
-$(call test_assert,$(call substr,xyz,2,3),yz)
-$(call test_assert,$(call substr,some string,1,1),s)
-$(call test_assert,$(call substr,some string,1,2),so)
-$(call test_assert,$(call substr,some string,1,3),som)
-$(call test_assert,$(call substr,some string,1,4),some)
-$(call test_assert,$(call substr,some string,1,5),some )
-$(call test_assert,$(call substr,some string,1,6),some s)
-$(call test_assert,$(call substr,some string,5,5), )
-$(call test_assert,$(call substr,some string,5,6), s)
-$(call test_assert,$(call substr,some string,5,7), st)
-$(call test_assert,$(call substr,some string,5,8), str)
-$(call test_assert,$(call substr,some string,1,100),some string)
-$(call stop_test)
-
-$(call start_test,lc)
-$(call test_assert,$(call lc,The Quick Brown Fox),the quick brown fox)
-$(call test_assert,$(call lc,the1 quick2 brown3 fox4),the1 quick2 brown3 fox4)
-$(call test_assert,$(call lc,The_),the_)
-$(call test_assert,$(call lc,),)
-$(call stop_test)
-
-$(call start_test,uc)
-$(call test_assert,$(call uc,The Quick Brown Fox),THE QUICK BROWN FOX)
-$(call test_assert,$(call uc,the1 quick2 brown3 fox4),THE1 QUICK2 BROWN3 FOX4)
-$(call test_assert,$(call uc,The_),THE_)
-$(call test_assert,$(call uc,),)
-$(call stop_test)
-
-$(call start_test,tr)
-$(call test_assert,$(call tr,A B C,1 2 3,CAPITAL),31PIT1L)
-$(call test_assert,$(call tr,a b c,1 2 3,CAPITAL),CAPITAL)
-$(call test_assert,$(call tr,E L I,3 1 1,I AM ELITE),1 AM 311T3)
-$(call stop_test)
-
-$(call start_test,leq)
-$(call test_assert,$(call leq,1 2 3,1 2 3),T)
-$(call test_assert,$(call leq,1 2 3,1 2 3 4),)
-$(call test_assert,$(call leq,1 2 3 4,1 2 3),)
-$(call test_assert,$(call leq,1,1),T)
-$(call test_assert,$(call leq,,),T)
-$(call stop_test)
-
-$(call start_test,lne)
-$(call test_assert,$(call lne,1 2 3,1 2 3),)
-$(call test_assert,$(call lne,1 2 3,1 2 3 4),T)
-$(call test_assert,$(call lne,1 2 3 4,1 2 3),T)
-$(call test_assert,$(call lne,1,1),)
-$(call test_assert,$(call lne,,),)
-$(call stop_test)
-
-$(call start_test,empty_set)
-$(call test_assert,$(empty_set),)
-$(call test_assert,$(empty_set),$(call set_create,))
-$(call stop_test)
-
-$(call start_test,set_create)
-$(call test_assert,$(call set_create,),)
-$(call test_assert,$(call set_create,1 2 2 3),1 2 3)
-$(call test_assert,$(call set_create,2 1 1 2 2 3),1 2 3)
-$(call test_assert,$(call set_create,1),1)
-$(call stop_test)
-
-$(call start_test,set_insert)
-$(call test_assert,$(call set_insert,1,$(empty_set)),1)
-$(call test_assert,$(call set_insert,1,$(call set_create,1)),1)
-$(call test_assert,$(call set_insert,1,$(call set_create,1 2)),1 2)
-$(call test_assert,$(call set_insert,0,$(call set_create,1 2)),0 1 2)
-$(call stop_test)
-
-$(call start_test,set_remove)
-$(call test_assert,$(call set_remove,1,$(empty_set)),$(empty_set))
-$(call test_assert,$(call set_remove,1,$(call set_create,1 2)),2)
-$(call test_assert,$(call set_remove,1,$(call set_create,1 11 2)),11 2)
-$(call test_assert,$(call set_remove,0,$(call set_create,1 2)),1 2)
-$(call stop_test)
-
-$(call start_test,set_is_member)
-$(call test_assert,$(call set_is_member,1,$(empty_set)),)
-$(call test_assert,$(call set_is_member,1,$(call set_create,2 3)),)
-$(call test_assert,$(call set_is_member,1,$(call set_create,1 2 3)),T)
-$(call test_assert,$(call set_is_member,1,$(call set_create,1)),T)
-$(call stop_test)
-
-$(call start_test,set_union)
-$(call test_assert,$(call set_union,,),)
-$(call test_assert,$(call set_union,1 2,),1 2)
-$(call test_assert,$(call set_union,,3 4),3 4)
-$(call test_assert,$(call set_union,1 2,3 4),1 2 3 4)
-$(call test_assert,$(call set_union,1 2 3,3 4 5),1 2 3 4 5)
-$(call stop_test)
-
-$(call start_test,set_intersection)
-$(call test_assert,$(call set_intersection,,),)
-$(call test_assert,$(call set_intersection,1 2,),)
-$(call test_assert,$(call set_intersection,,3 4),)
-$(call test_assert,$(call set_intersection,1 2,3 4),)
-$(call test_assert,$(call set_intersection,1 2 3 4,3 4 5),3 4)
-$(call stop_test)
-
-$(call start_test,set_is_subset)
-$(call test_assert,$(call set_is_subset,,),T)
-$(call test_assert,$(call set_is_subset,1 2,),)
-$(call test_assert,$(call set_is_subset,,3 4),T)
-$(call test_assert,$(call set_is_subset,1 2,3 4),)
-$(call test_assert,$(call set_is_subset,1 2,1 2 3 4 5),T)
-$(call test_assert,$(call set_is_subset,1 2,1 2),T)
-$(call test_assert,$(call set_is_subset,1 2,1 3 4 5),)
-$(call stop_test)
-
-$(call start_test,set_equal)
-$(call test_assert,$(call set_equal,,),T)
-$(call test_assert,$(call set_equal,1,),)
-$(call test_assert,$(call set_equal,,1),)
-$(call test_assert,$(call set_equal,1,1),T)
-$(call test_assert,$(call set_equal,1 2,),)
-$(call test_assert,$(call set_equal,,1 2),)
-$(call test_assert,$(call set_equal,1 2,1 2 3),)
-$(call stop_test)
-
-$(call start_test,int_encode)
-$(call test_assert,$(call int_encode,0),)
-$(call test_assert,$(call int_encode,1),x)
-$(call test_assert,$(call int_encode,2),x x)
-$(call test_assert,$(call int_encode,10),x x x x x x x x x x)
-$(call stop_test)
-
-$(call start_test,int_decode)
-$(call test_assert,$(call int_decode,),0)
-$(call test_assert,$(call int_decode,x),1)
-$(call test_assert,$(call int_decode,x x),2)
-$(call test_assert,$(call int_decode,x x x x x x x x x x),10)
-$(call stop_test)
-
-$(call start_test,int_plus)
-$(call test_assert,$(call int_plus,$(call int_encode,3),$(call int_encode,4)),$(call int_encode,7))
-$(call test_assert,$(call int_plus,$(call int_encode,0),$(call int_encode,4)),$(call int_encode,4))
-$(call test_assert,$(call int_plus,$(call int_encode,3),$(call int_encode,0)),$(call int_encode,3))
-$(call test_assert,$(call int_plus,$(call int_encode,0),$(call int_encode,0)),$(call int_encode,0))
-$(call test_assert,$(call int_plus,$(call int_encode,1),$(call int_encode,0)),$(call int_encode,1))
-$(call stop_test)
-
-$(call start_test,plus)
-$(call test_assert,$(call plus,3,4),7)
-$(call test_assert,$(call plus,4,3),7)
-$(call test_assert,$(call plus,0,4),4)
-$(call test_assert,$(call plus,3,0),3)
-$(call test_assert,$(call plus,0,0),0)
-$(call stop_test)
-
-__gmsl_warning = $1
-$(call start_test,int_subtract)
-$(call test_assert,$(call int_subtract,$(call int_encode,3),$(call int_encode,4)),Subtraction underflow)
-$(call test_assert,$(call int_subtract,$(call int_encode,4),$(call int_encode,3)),$(call int_encode,1))
-$(call test_assert,$(call int_subtract,$(call int_encode,3),$(call int_encode,0)),$(call int_encode,3))
-$(call test_assert,$(call int_subtract,$(call int_encode,0),$(call int_encode,0)),$(call int_encode,0))
-$(call test_assert,$(call int_subtract,$(call int_encode,1),$(call int_encode,0)),$(call int_encode,1))
-$(call stop_test)
-
-__gmsl_warning = x x x x x x x x x x
-$(call start_test,subtract)
-$(call test_assert,$(call subtract,3,4),10)
-$(call test_assert,$(call subtract,4,3),1)
-$(call test_assert,$(call subtract,3,0),3)
-$(call test_assert,$(call subtract,0,0),0)
-$(call stop_test)
-
-$(call start_test,int_multiply)
-$(call test_assert,$(call int_multiply,$(call int_encode,3),$(call int_encode,4)),$(call int_encode,12))
-$(call test_assert,$(call int_multiply,$(call int_encode,4),$(call int_encode,3)),$(call int_encode,12))
-$(call test_assert,$(call int_multiply,$(call int_encode,3),$(call int_encode,0)),$(call int_encode,0))
-$(call test_assert,$(call int_multiply,$(call int_encode,0),$(call int_encode,0)),$(call int_encode,0))
-$(call test_assert,$(call int_multiply,$(call int_encode,1),$(call int_encode,0)),$(call int_encode,0))
-$(call stop_test)
-
-$(call start_test,multiply)
-$(call test_assert,$(call multiply,3,4),12)
-$(call test_assert,$(call multiply,4,3),12)
-$(call test_assert,$(call multiply,3,0),0)
-$(call test_assert,$(call multiply,0,3),0)
-$(call test_assert,$(call multiply,0,0),0)
-$(call stop_test)
-
-__gmsl_error = $1
-$(call start_test,int_divide)
-$(call test_assert,$(call int_divide,$(call int_encode,3),$(call int_encode,4)),$(call int_encode,0))
-$(call test_assert,$(call int_divide,$(call int_encode,4),$(call int_encode,3)),$(call int_encode,1))
-$(call test_assert,$(call int_divide,$(call int_encode,31),$(call int_encode,3)),$(call int_encode,10))
-$(call test_assert,$(call int_divide,$(call int_encode,30),$(call int_encode,3)),$(call int_encode,10))
-$(call test_assert,$(call int_divide,$(call int_encode,29),$(call int_encode,3)),$(call int_encode,9))
-$(call test_assert,$(call int_divide,$(call int_encode,0),$(call int_encode,1)),$(call int_encode,0))
-$(call test_assert,$(call int_divide,$(call int_encode,1),$(call int_encode,0)),Division by zero)
-$(call stop_test)
-
-__gmsl_error = x x x x x x x x x x
-$(call start_test,divide)
-$(call test_assert,$(call divide,3,4),0)
-$(call test_assert,$(call divide,4,3),1)
-$(call test_assert,$(call divide,21,2),10)
-$(call test_assert,$(call divide,20,2),10)
-$(call test_assert,$(call divide,19,2),9)
-$(call test_assert,$(call divide,1,0),10)
-$(call stop_test)
-
-$(call start_test,associative array)
-$(call test_assert,$(call get,myarray,key1),)
-$(call set,myarray,key1,value1)
-$(call test_assert,$(call get,myarray,key1),value1)
-$(call test_assert,$(call get,myarray,key2),)
-$(call test_assert,$(call get,myarray1,key1),)
-$(call test_assert,$(call defined,myarray,key1),T)
-$(call test_assert,$(call defined,myarray,key2),)
-$(call test_assert,$(call defined,myarray1,key1),)
-$(call set,myarray,key2,value2)
-$(call test_assert,$(call keys,myarray),key1 key2)
-$(call test_assert,$(call keys,myarray1),)
-$(call stop_test)
-
-$(call start_test,named stack)
-$(call test_assert,$(call pop,mystack),)
-$(call test_assert,$(call push,mystack,e2))
-$(call push,mystack,e1)
-$(call test_assert,$(call pop,mystack),e1)
-$(call test_assert,$(call pop,mystack),e2)
-$(call push,mystack,f3)
-$(call push,mystack,f1)
-$(call test_assert,$(call pop,mystack),f1)
-$(call push,mystack,f2)
-$(call test_assert,$(call peek,mystack),f2)
-$(call test_assert,$(call depth,mystack),2)
-$(call test_assert,$(call pop,mystack),f2)
-$(call test_assert,$(call depth,mystack),1)
-$(call test_assert,$(call pop,myotherstack),)
-$(call stop_test)
-
-$(call start_test,reverse)
-$(call test_assert,$(call reverse,),)
-$(call test_assert,$(call reverse,1),1)
-$(call test_assert,$(call reverse,1 2),2 1)
-$(call test_assert,$(call reverse,1 2 3),3 2 1)
-$(call stop_test)
-
-$(call start_test,uniq)
-$(call test_assert,$(call uniq,),)
-$(call test_assert,$(call uniq,a),a)
-$(call test_assert,$(call uniq,a a),a)
-$(call test_assert,$(call uniq,a aa),a aa)
-$(call test_assert,$(call uniq,a aa a),a aa)
-$(call test_assert,$(call uniq,a b ba ab b a a ba a),a b ba ab)
-$(call stop_test)
-
-c:=,
-$(call start_test,split)
-$(call test_assert,$(call split,$c,comma$cseparated$cstring),comma separated string)
-$(call test_assert,$(call split,*,star*field*record),star field record)
-$(call test_assert,$(call split,*,star*),star)
-$(call test_assert,$(call split,*,star*field),star field)
-$(call test_assert,$(call split,*,star****field),star field)
-$(call test_assert,$(call split,*,),)
-$(call stop_test)
-
-$(call start_test,merge)
-$(call test_assert,$(call merge,$c,list of things),list$cof$cthings)
-$(call test_assert,$(call merge,*,list of things),list*of*things)
-$(call test_assert,$(call merge,*,list),list)
-$(call test_assert,$(call merge,*,),)
-$(call stop_test)
-
-$(call start_test,int_max)
-$(call test_assert,$(call int_max,$(call int_encode,2),$(call int_encode,1)),$(call int_encode,2))
-$(call test_assert,$(call int_max,$(call int_encode,1),$(call int_encode,2)),$(call int_encode,2))
-$(call test_assert,$(call int_max,$(call int_encode,2),$(call int_encode,0)),$(call int_encode,2))
-$(call test_assert,$(call int_max,$(call int_encode,0),$(call int_encode,2)),$(call int_encode,2))
-$(call test_assert,$(call int_max,$(call int_encode,2),$(call int_encode,2)),$(call int_encode,2))
-$(call test_assert,$(call int_max,$(call int_encode,0),$(call int_encode,0)),$(call int_encode,0))
-$(call stop_test)
-
-$(call start_test,max)
-$(call test_assert,$(call max,2,1),2)
-$(call test_assert,$(call max,1,2),2)
-$(call test_assert,$(call max,2,0),2)
-$(call test_assert,$(call max,0,2),2)
-$(call test_assert,$(call max,2,2),2)
-$(call test_assert,$(call max,0,0),0)
-$(call stop_test)
-
-$(call start_test,int_min)
-$(call test_assert,$(call int_min,$(call int_encode,2),$(call int_encode,1)),$(call int_encode,1))
-$(call test_assert,$(call int_min,$(call int_encode,1),$(call int_encode,2)),$(call int_encode,1))
-$(call test_assert,$(call int_min,$(call int_encode,2),$(call int_encode,0)),$(call int_encode,0))
-$(call test_assert,$(call int_min,$(call int_encode,0),$(call int_encode,2)),$(call int_encode,0))
-$(call test_assert,$(call int_min,$(call int_encode,2),$(call int_encode,2)),$(call int_encode,2))
-$(call test_assert,$(call int_min,$(call int_encode,0),$(call int_encode,0)),$(call int_encode,0))
-$(call stop_test)
-
-$(call start_test,min)
-$(call test_assert,$(call min,2,1),1)
-$(call test_assert,$(call min,1,2),1)
-$(call test_assert,$(call min,2,0),0)
-$(call test_assert,$(call min,0,2),0)
-$(call test_assert,$(call min,2,2),2)
-$(call test_assert,$(call min,0,0),0)
-$(call stop_test)
-
-__gmsl_error = $1
-$(call start_test,assert functions)
-$(call test_assert,$(call assert,$(true),ignore),)
-$(call test_assert,$(call assert,$(false),failed),Assertion failure: failed)
-$(call test_assert,$(call assert_exists,gmsl-tests),)
-$(call test_assert,$(call assert_exists,MISSING-gmsl-tests),Assertion failure: file 'MISSING-gmsl-tests' missing)
-$(call stop_test)
-
-$(call start_test,int_inc)
-$(call test_assert,$(call int_inc,$(call int_encode,0)),$(call int_encode,1))
-$(call test_assert,$(call int_inc,$(call int_encode,1)),$(call int_encode,2))
-$(call test_assert,$(call int_inc,$(call int_encode,4)),$(call int_encode,5))
-$(call test_assert,$(call int_inc,$(call int_encode,10)),$(call int_encode,11))
-$(call stop_test)
-
-$(call start_test,inc)
-$(call test_assert,$(call inc,0),1)
-$(call test_assert,$(call inc,1),2)
-$(call test_assert,$(call inc,4),5)
-$(call test_assert,$(call inc,10),11)
-$(call stop_test)
-
-__gmsl_warning = $1
-$(call start_test,int_dec)
-$(call test_assert,$(call int_dec,$(call int_encode,0)),Decrement underflow)
-$(call test_assert,$(call int_dec,$(call int_encode,1)),$(call int_encode,0))
-$(call test_assert,$(call int_dec,$(call int_encode,4)),$(call int_encode,3))
-$(call test_assert,$(call int_dec,$(call int_encode,10)),$(call int_encode,9))
-$(call stop_test)
-
-__gmsl_warning = x x x x x x x x x x
-$(call start_test,dec)
-$(call test_assert,$(call dec,0),10)
-$(call test_assert,$(call dec,1),0)
-$(call test_assert,$(call dec,4),3)
-$(call test_assert,$(call dec,10),9)
-$(call stop_test)
-
-$(call start_test,int_double)
-$(call test_assert,$(call int_double,$(call int_encode,0)),$(call int_encode,0))
-$(call test_assert,$(call int_double,$(call int_encode,1)),$(call int_encode,2))
-$(call test_assert,$(call int_double,$(call int_encode,4)),$(call int_encode,8))
-$(call stop_test)
-
-$(call start_test,double)
-$(call test_assert,$(call double,0),0)
-$(call test_assert,$(call double,1),2)
-$(call test_assert,$(call double,4),8)
-$(call stop_test)
-
-$(call start_test,int_halve)
-$(call test_assert,$(call int_halve,$(call int_encode,0)),$(call int_encode,0))
-$(call test_assert,$(call int_halve,$(call int_encode,2)),$(call int_encode,1))
-$(call test_assert,$(call int_halve,$(call int_encode,8)),$(call int_encode,4))
-$(call test_assert,$(call int_halve,$(call int_encode,7)),$(call int_encode,3))
-$(call stop_test)
-
-$(call start_test,halve)
-$(call test_assert,$(call halve,0),0)
-$(call test_assert,$(call halve,2),1)
-$(call test_assert,$(call halve,8),4)
-$(call test_assert,$(call halve,7),3)
-$(call stop_test) 
-
-$(call start_test,gt)
-$(call test_assert,$(call gt,2,3),)
-$(call test_assert,$(call gt,3,2),$(true))
-$(call test_assert,$(call gt,2,2),)
-$(call stop_test)
-
-$(call start_test,gte)
-$(call test_assert,$(call gte,2,3),)
-$(call test_assert,$(call gte,3,2),$(true))
-$(call test_assert,$(call gte,2,2),$(true))
-$(call stop_test)
-
-$(call start_test,lt)
-$(call test_assert,$(call lt,2,3),$(true))
-$(call test_assert,$(call lt,3,2),)
-$(call test_assert,$(call lt,2,2),)
-$(call stop_test)
-
-$(call start_test,lte)
-$(call test_assert,$(call lte,2,3),$(true))
-$(call test_assert,$(call lte,3,2),)
-$(call test_assert,$(call lte,2,2),$(true))
-$(call stop_test)
-
-$(call start_test,eq)
-$(call test_assert,$(call eq,2,3),)
-$(call test_assert,$(call eq,3,2),)
-$(call test_assert,$(call eq,2,2),$(true))
-$(call stop_test)
-
-$(call start_test,ne)
-$(call test_assert,$(call ne,2,3),$(true))
-$(call test_assert,$(call ne,3,2),$(true))
-$(call test_assert,$(call ne,2,2),)
-$(call stop_test)
-
-$(call start_test,int_gt)
-$(call test_assert,$(call int_gt,$(call int_encode,2),$(call int_encode,3)),)
-$(call test_assert,$(call int_gt,$(call int_encode,3),$(call int_encode,2)),$(true))
-$(call test_assert,$(call int_gt,$(call int_encode,2),$(call int_encode,2)),)
-$(call stop_test)
-
-$(call start_test,int_gte)
-$(call test_assert,$(call int_gte,$(call int_encode,2),$(call int_encode,3)),)
-$(call test_assert,$(call int_gte,$(call int_encode,3),$(call int_encode,2)),$(true))
-$(call test_assert,$(call int_gte,$(call int_encode,2),$(call int_encode,2)),$(true))
-$(call stop_test)
-
-$(call start_test,int_lt)
-$(call test_assert,$(call int_lt,$(call int_encode,2),$(call int_encode,3)),$(true))
-$(call test_assert,$(call int_lt,$(call int_encode,3),$(call int_encode,2)),)
-$(call test_assert,$(call int_lt,$(call int_encode,2),$(call int_encode,2)),)
-$(call stop_test)
-
-$(call start_test,int_lte)
-$(call test_assert,$(call int_lte,$(call int_encode,2),$(call int_encode,3)),$(true))
-$(call test_assert,$(call int_lte,$(call int_encode,3),$(call int_encode,2)),)
-$(call test_assert,$(call int_lte,$(call int_encode,2),$(call int_encode,2)),$(true))
-$(call stop_test)
-
-$(call start_test,int_eq)
-$(call test_assert,$(call int_eq,$(call int_encode,2),$(call int_encode,3)),)
-$(call test_assert,$(call int_eq,$(call int_encode,3),$(call int_encode,2)),)
-$(call test_assert,$(call int_eq,$(call int_encode,2),$(call int_encode,2)),$(true))
-$(call stop_test)
-
-$(call start_test,int_ne)
-$(call test_assert,$(call int_ne,$(call int_encode,2),$(call int_encode,3)),$(true))
-$(call test_assert,$(call int_ne,$(call int_encode,3),$(call int_encode,2)),$(true))
-$(call test_assert,$(call int_ne,$(call int_encode,2),$(call int_encode,2)),)
-$(call stop_test)
-
-$(call start_test,gmsl_compatible)
-$(call test_assert,$(call gmsl_compatible,$(gmsl_version)),$(true))
-$(call test_assert,$(call gmsl_compatible,0 9 0),$(true))
-$(call test_assert,$(call gmsl_compatible,0 0 1),$(true))
-$(call test_assert,$(call gmsl_compatible,0 0 0),$(true))
-$(call test_assert,$(call gmsl_compatible,2 0 0),)
-$(call test_assert,$(call gmsl_compatible,1 1 0),)
-$(call test_assert,$(call gmsl_compatible,1 0 8),$(true))
-$(call test_assert,$(call gmsl_compatible,1 0 8),$(true))
-$(call test_assert,$(call gmsl_compatible,1 0 10),$(true))
-$(call test_assert,$(call gmsl_compatible,1 0 11),$(true))
-$(call test_assert,$(call gmsl_compatible,1 0 12),)
-$(call stop_test)
diff --git a/ndk/build/gmsl/index.html b/ndk/build/gmsl/index.html
deleted file mode 100644
index 8cc93ae..0000000
--- a/ndk/build/gmsl/index.html
+++ /dev/null
@@ -1,687 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-  <title>GNU Make Standard Library</title></head>
-
-<body>
-<h1>GNU Make Standard Library</h1>
-The GNU Make Standard Library (GMSL) is a collection of functions
-implemented using native GNU Make functionality that provide list and
-string manipulation, integer arithmetic, associative arrays, stacks,
-and debugging facilities.&nbsp; The GMSL is released under the BSD License.<br>
-<br>
-<a href="http://sourceforge.net/projects/gmsl/">[Project Page]</a> <a href="http://sourceforge.net/project/showfiles.php?group_id=129887">[Download]</a>
-<a href="http://sourceforge.net/forum/forum.php?forum_id=443916">[Discussion
-Forum]</a><br>
-<h2>Using GMSL</h2>
-The two files needed are <span style="font-family: monospace;">gmsl</span>
-and <span style="font-family: monospace;">__gmsl</span>.&nbsp; To
-include the GMSL in your Makefile do<br>
-<pre style="margin-left: 40px;">include gmsl</pre>
-<span style="font-family: monospace;">gmsl</span> automatically includes<span style="font-family: monospace;"> __gmsl</span>.&nbsp; To check that
-you have the right version of <span style="font-family: monospace;">gmsl</span>
-use the <span style="font-family: monospace;">gmsl_compatible</span>
-function (see
-below). The current version is <span style="font-family: monospace;">1
-0 11</span>.<br>
-<br>
-The GMSL package also includes a test suite for GMSL.&nbsp; Just run <span style="font-family: monospace;">make -f gmsl-tests</span>.<br>
-<h2>Logical Operators</h2>GMSL has boolean $(true) (a non-empty string)
-and $(false) (an empty string).&nbsp; The following operators can be
-used with those variables.<br>
-<br>
-<hr style="width: 100%; height: 2px;"><span style="font-weight: bold;">not</span><br>
-
-<br>
-
-<span style="font-family: monospace;">Arguments: A boolean value</span><br style="font-family: monospace;">
-
-<span style="font-family: monospace;">Returns:&nbsp;&nbsp; Returns $(true) if the boolean is $(false) and vice versa</span><br style="font-family: monospace;">
-
-<hr style="width: 100%; height: 2px; font-family: monospace;"><span style="font-weight: bold;"></span><span style="font-weight: bold;">and</span><br>
-<br>
-<span style="font-family: monospace;">Arguments: Two boolean values</span><br style="font-family: monospace;">
-<span style="font-family: monospace;">Returns:&nbsp;&nbsp; Returns $(true) if both of the booleans are true</span><br style="font-family: monospace;">
-<hr style="width: 100%; height: 2px; font-family: monospace;"><span style="font-weight: bold;">or</span><br>
-<br>
-<span style="font-family: monospace;">Arguments: Two boolean values</span><br style="font-family: monospace;">
-<span style="font-family: monospace;">Returns:&nbsp;&nbsp; Returns $(true) if either of the booleans is true</span><br style="font-family: monospace;">
-<hr style="width: 100%; height: 2px; font-family: monospace;"><span style="font-weight: bold;">xor</span><br style="font-weight: bold;">
-<br>
-<span style="font-family: monospace;">Arguments: Two boolean values</span><br style="font-family: monospace;">
-<span style="font-family: monospace;">Returns:&nbsp;&nbsp; Returns $(true) if exactly one of the booleans is true</span><br style="font-family: monospace;">
-<hr style="width: 100%; height: 2px; font-family: monospace;"><span style="font-weight: bold;">nand</span><br>
-<br>
-<span style="font-family: monospace;">Arguments: Two boolean values</span><br style="font-family: monospace;">
-<span style="font-family: monospace;">Returns:&nbsp;&nbsp; Returns value of 'not and'</span><br style="font-family: monospace;">
-<hr style="width: 100%; height: 2px; font-family: monospace;"><span style="font-weight: bold;">nor</span><br>
-<br>
-<span style="font-family: monospace;">Arguments: Two boolean values</span><br style="font-family: monospace;">
-<span style="font-family: monospace;">Returns:&nbsp;&nbsp; Returns value of 'not or'</span><br style="font-family: monospace;">
-<hr style="width: 100%; height: 2px; font-family: monospace;"><span style="font-weight: bold;">xnor</span><br>
-<br>
-<span style="font-family: monospace;">Arguments: Two boolean values</span><br style="font-family: monospace;">
-<span style="font-family: monospace;">Returns:&nbsp;&nbsp; Returns value of 'not xor'</span><br style="font-family: monospace;">
-<hr style="width: 100%; height: 2px; font-family: monospace;">
-<h2>List Manipulation Functions</h2>
-&nbsp;A list is a string of characters; the list separator is a space.<br>
-
-<br>
-<hr style="width: 100%; height: 2px;"><b>first</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A list<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the first element of a list<br>
-</span>
-<hr><b>last</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A list<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the last element of a list<br>
-</span>
-<hr><b>rest</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A list<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the list with the first element
-removed<br>
-</span>
-<hr><b>chop</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A list<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the list with the last element removed<br>
-</span>
-<hr><b>map</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: Name of function to
-$(call) for each element of list<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: List to
-iterate over calling the function in 1<br>
-Returns:&nbsp;&nbsp;&nbsp;The list after calling the function on each
-element<br>
-</span>
-<hr><b>pairmap</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: Name of function to
-$(call) for each pair of elements<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: List to
-iterate over calling the function in 1<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 3: Second
-list to iterate over calling the function in 1<br>
-Returns:&nbsp;&nbsp;&nbsp;The list after calling the function on each
-pair of elements<br>
-</span>
-<hr><b>leq</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A list to compare
-against...<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: ...this
-list<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns $(true) if the two lists are identical<br>
-</span>
-<hr><b>lne</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A list to compare
-against...<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: ...this
-list<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns $(true) if the two lists are different<br>
-</span>
-<hr><b>reverse</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A list to reverse<br>
-Returns:&nbsp;&nbsp;&nbsp;The list with its elements in reverse order<br>
-</span>
-<hr><b>uniq</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A list to deduplicate<br>
-Returns:&nbsp;&nbsp;&nbsp;The list with elements in order without duplicates<br>
-</span>
-<hr><b>length</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A list<br>
-Returns:&nbsp;&nbsp;&nbsp;The number of elements in the list<br>
-</span>
-<hr style="width: 100%; height: 2px;"><span style="font-family: monospace;"></span>
-<h2>String Manipulation Functions</h2>
-A string is any sequence of characters.<br>
-<br>
-<hr style="width: 100%; height: 2px;"><b>seq</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A string to compare
-against...<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: ...this
-string<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns $(true) if the two strings are
-identical<br>
-</span>
-<hr><b>sne</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A string to compare
-against...<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: ...this
-string<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns $(true) if the two strings are not
-the same<br>
-</span>
-<hr><b>strlen</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A string<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the length of the string<br>
-</span>
-<hr><b>substr</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A string<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: Start offset (first character is 1)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 3: Ending offset (inclusive)<br>Returns:&nbsp;&nbsp;&nbsp;Returns a substring<br>
-</span>
-<hr><b>split</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: The character to
-split on<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: A
-string to split<br>
-Returns:&nbsp;&nbsp;&nbsp;Splits a string into a list separated by
-spaces at the split<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; character
-in the first argument<br>
-</span>
-<hr><b>merge</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: The character to
-put between fields<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: A list
-to merge into a string<br>
-Returns:&nbsp;&nbsp;&nbsp;Merges a list into a single string, list
-elements are separated<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; by the
-character in the first argument<br>
-</span>
-<hr><b>tr</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: The list of
-characters to translate from <br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: The
-list of characters to translate to<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 3: The
-text to translate<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the text after translating characters<br>
-</span>
-<hr><b>uc</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: Text to upper case<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the text in upper case<br>
-</span>
-<hr><b>lc</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: Text to lower case<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the text in lower case<br>
-</span>
-<hr style="width: 100%; height: 2px;"><span style="font-family: monospace;"></span>
-<h2>Set Manipulation Functions</h2>
-Sets are represented by sorted, deduplicated lists.  To create a set
-from a list use <span style="font-family:
-monospace;">set_create</span>, or start with the <span
-style="font-family: monospace;">empty_set</span> and <span
-style="font-family: monospace;">set_insert</span> individual elements.
-The empty set is defined as <span style="font-family:
-monospace;">empty_set</span>.<p>
-
-<hr><b>set_create</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A list of set elements<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the newly created set<br>
-</span>
-
-<hr><b>set_insert</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A single element to add to a set<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2: A set<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the set with the element added<br>
-</span>
-
-<hr><b>set_remove</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A single element to remove from a set<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2: A set<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the set with the element removed<br>
-</span>
-
-<hr><b>set_is_member</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A single element<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2: A set<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns $(true) if the element is in the set<br>
-</span>
-
-<hr><b>set_union</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A set<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2: Another set<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the union of the two sets<br>
-</span>
-
-<hr><b>set_intersection</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A set<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2: Another set<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the intersection of the two sets<br>
-</span>
-
-<hr><b>set_is_subset</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A set<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2: Another set<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns $(true) if the first set is a subset of the second<br>
-</span>
-
-<hr><b>set_equal</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A set<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2: Another set<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns $(true) if the two sets are identical<br>
-</span>
-
-<hr style="width: 100%; height: 2px;"><span style="font-family: monospace;"></span>
-<h2>Integer Arithmetic Functions</h2>
-Integers are represented by lists with the equivalent number of
-x's.&nbsp; For example the number 4 is x x x x.&nbsp; The maximum
-integer that the library can handle as <span style="font-style: italic;">input</span> (i.e. as the argument to a
-call to <span style="font-family: monospace;">int_encode</span>) is
-65536. There is no limit on integer size for internal computations or
-output.<br>
-<br>
-The arithmetic library functions come in two forms: one form of each
-function takes integers as arguments and the other form takes the
-encoded form (x's created by a call to <span style="font-family: monospace;">int_encode</span>).&nbsp; For example,
-there are two plus functions: <span style="font-family: monospace;">plus</span>
-(called with integer arguments and returns an integer) and <span style="font-family: monospace;">int_plus</span> (called with encoded
-arguments and returns an encoded result).<br>
-<br>
-<span style="font-family: monospace;">plus</span> will be slower than <span style="font-family: monospace;">int_plus</span> because its arguments
-and result have to be translated between the x's format and
-integers.&nbsp; If doing a complex calculation use the <span style="font-family: monospace;">int_*</span> forms with a single
-encoding of inputs and single decoding of the output.&nbsp; For simple
-calculations the direct forms can be used.<br>
-<br>
-<hr style="width: 100%; height: 2px;"><b>int_decode</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A number of x's
-representation<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the integer for human consumption
-that is represented<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; by the
-string of x's<br>
-</span>
-<hr><b>int_encode</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A number in
-human-readable integer form<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the integer encoded as a string of x's<br>
-</span>
-<hr><b>int_plus</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A number in x's
-representation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: Another
-number in x's represntation<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the sum of the two numbers in x's
-representation<br>
-</span>
-<hr><b>plus (wrapped version of int_plus)</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: An integer<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: Another
-integer<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the sum of the two integers<br>
-</span>
-<hr><b>int_subtract</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A number in x's
-representation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: Another
-number in x's represntation<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the difference of the two numbers in
-x's representation,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; or outputs
-an error on a numeric underflow<br>
-</span>
-<hr><b>subtract (wrapped version of int_subtract)</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: An integer<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: Another
-integer<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the difference of the two integers,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; or outputs
-an error on a numeric underflow<br>
-</span>
-<hr><b>int_multiply</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A number in x's
-representation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: Another
-number in x's represntation<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the product of the two numbers in x's
-representation<br>
-</span>
-<hr><b>multiply (wrapped version of int_multiply)</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: An integer<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: Another
-integer<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the product of the two integers<br>
-</span>
-<hr><b>int_divide</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A number in x's
-representation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: Another
-number in x's represntation<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the result of integer division of
-argument 1 divided<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; by
-argument 2 in x's representation<br>
-</span>
-<hr><b>divide (wrapped version of int_divide)</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: An integer<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: Another
-integer<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the integer division of the first
-argument by the second<br>
-</span>
-<hr><b>int_max, int_min</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A number in x's
-representation<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: Another
-number in x's represntation<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the maximum or minimum of its
-arguments in x's<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-representation<br>
-</span>
-<hr><b>max, min</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: An integer<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: Another
-integer<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns the maximum or minimum of its integer
-arguments<br>
-</span>
-<hr><b>int_gt, int_gte, int_lt, int_lte, int_eq, int_ne</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: Two x's representation
-numbers to be compared<br>
-Returns:&nbsp;&nbsp;&nbsp;$(true) or $(false)<br>
-<br>
-int_gt First argument greater than second argument<br>
-int_gte First argument greater than or equal to second argument<br>
-int_lt First argument less than second argument <br>
-int_lte First argument less than or equal to second argument<br>
-int_eq First argument is numerically equal to the second argument<br>
-int_ne First argument is not numerically equal to the second argument<br>
-</span>
-<hr><b>gt, gte, lt, lte, eq, ne</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: Two integers to be
-compared<br>
-Returns:&nbsp;&nbsp;&nbsp;$(true) or $(false)<br>
-<br>
-gt First argument greater than second argument<br>
-gte First argument greater than or equal to second argument<br>
-lt First argument less than second argument <br>
-lte First argument less than or equal to second argument<br>
-eq First argument is numerically equal to the second argument<br>
-ne First argument is not numerically equal to the second argument<br>
-</span>
-increment adds 1 to its argument, decrement subtracts 1. Note that<br>
-decrement does not range check and hence will not underflow, but<br>
-will incorrectly say that 0 - 1 = 0<br>
-<hr><b>int_inc</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A number in x's
-representation<br>
-Returns:&nbsp;&nbsp;&nbsp;The number incremented by 1 in x's
-representation<br>
-</span>
-<hr><b>inc</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: An integer<br>
-Returns:&nbsp;&nbsp;&nbsp;The argument incremented by 1<br>
-</span>
-<hr><b>int_dec</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A number in x's
-representation<br>
-Returns:&nbsp;&nbsp;&nbsp;The number decremented by 1 in x's
-representation<br>
-</span>
-<hr><b>dec</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: An integer<br>
-Returns:&nbsp;&nbsp;&nbsp;The argument decremented by 1<br>
-</span>
-<hr><b>int_double</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A number in x's
-representation<br>
-Returns:&nbsp;&nbsp;&nbsp;The number doubled (i.e. * 2) and returned in
-x's representation<br>
-</span>
-<hr><b>double</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: An integer<br>
-Returns:&nbsp;&nbsp;&nbsp;The integer times 2<br>
-</span>
-<hr><b>int_halve</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A number in x's
-representation<br>
-Returns:&nbsp;&nbsp;&nbsp;The number halved (i.e. / 2) and returned in
-x's representation<br>
-</span>
-<hr><b>halve</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: An integer<br>
-Returns:&nbsp;&nbsp;&nbsp;The integer divided by 2<br>
-</span>
-<hr style="width: 100%; height: 2px;"><span style="font-family: monospace;"></span>
-<h2>Associative Arrays</h2>
-An associate array maps a key value (a string with no spaces in it) to
-a single value (any string).&nbsp;&nbsp;&nbsp; <br>
-<b><br>
-</b>
-<hr style="width: 100%; height: 2px;"><b>set</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: Name of associative
-array<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: The key
-value to associate<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 3: The
-value associated with the key<br>
-Returns:&nbsp;&nbsp;&nbsp;None<br>
-</span>
-<hr><b>get</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: Name of associative
-array<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: The key
-to retrieve<br>
-Returns:&nbsp;&nbsp;&nbsp;The value stored in the array for that key<br>
-</span>
-<hr><b>keys</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: Name of associative
-array<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns a list of all defined keys in the
-array<br>
-</span>
-<hr><b>defined</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: Name of associative
-array<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: The key
-to test<br>
-Returns:&nbsp;&nbsp;&nbsp;Returns true if the key is defined (i.e. not
-empty)<br>
-</span>
-<hr style="width: 100%; height: 2px;"><span style="font-family: monospace;"></span>
-<h2>Named Stacks</h2>
-A stack is an ordered list of strings (with no spaces in them).<br>
-<br>
-<hr style="width: 100%; height: 2px;"><b>push</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: Name of stack<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: Value
-to push onto the top of the stack (must not contain<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; a space)<br>
-Returns:&nbsp;&nbsp;&nbsp;None<br>
-</span>
-<hr><b>pop</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: Name of stack<br>
-Returns:&nbsp;&nbsp;&nbsp;Top element from the stack after removing it<br>
-</span>
-<hr><b>peek</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: Name of stack<br>
-Returns:&nbsp;&nbsp;&nbsp;Top element from the stack without removing it<br>
-</span>
-<hr><b>depth</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: Name of stack<br>
-Returns:&nbsp;&nbsp;&nbsp;Number of items on the stack<br>
-</span>
-<hr style="width: 100%; height: 2px;"><span style="font-family: monospace;"></span>
-<h2>Miscellaneous and Debugging Facilities</h2>
-GMSL defines the following constants; all are accessed as normal GNU
-Make variables by wrapping them in <span style="font-family: monospace;">$()</span> or <span style="font-family: monospace;">${}</span>.<br>
-<br>
-<table style="text-align: left;" border="1" cellpadding="2" cellspacing="2">
-  <tbody>
-    <tr>
-      <td><span style="font-style: italic;">Constant</span><br>
-      </td>
-      <td><span style="font-style: italic;">Value</span><br>
-      </td>
-      <td><span style="font-style: italic;">Purpose</span><br>
-      </td>
-    </tr>
-    <tr>
-      <td><span style="font-family: monospace;">true</span><br>
-      </td>
-      <td><span style="font-family: monospace;">T</span><br>
-      </td>
-      <td>Boolean for <span style="font-family: monospace;">$(if)</span>
-and return from&nbsp; GMSL functions<br>
-      </td>
-    </tr>
-    <tr>
-      <td><span style="font-family: monospace;">false</span><br>
-      </td>
-      <td><br>
-      </td>
-      <td>Boolean for <span style="font-family: monospace;">$(if)</span>
-and return from GMSL functions<br>
-      </td>
-    </tr>
-    <tr>
-      <td><span style="font-family: monospace;">gmsl_version</span><br>
-      </td>
-      <td><span style="font-family: monospace;">1 0 0</span><br>
-      </td>
-      <td>GMSL version number as list: major minor revision<br>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<span style="font-weight: bold;"><br>
-gmsl_compatible</span><span style="font-family: monospace;"><br>
-<br>
-Arguments: List containing the desired library version number (maj min
-rev)<br>
-</span><span style="font-family: monospace;">Returns:&nbsp;&nbsp;
-$(true) if this version of the library is compatible<br>
-</span><span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-with the requested version number, otherwise $(false)</span>
-<hr><b>gmsl-print-% (target not a function)</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: The % should be
-replaced by the name of a variable that you<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; wish to
-print out.<br>
-Action:&nbsp;&nbsp;&nbsp; Echos the name of the variable that matches
-the % and its value.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; For
-example, 'make gmsl-print-SHELL' will output the value of<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; the SHELL
-variable<br>
-</span>
-<hr><b>assert</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: A boolean that must
-be true or the assertion will fail<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2: The
-message to print with the assertion<br>
-Returns:&nbsp;&nbsp;&nbsp;None<br>
-</span>
-<hr><b>assert_exists</b><br>
-<br>
-<span style="font-family: monospace;">Arguments: 1: Name of file that
-must exist, if it is missing an assertion<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; will be
-generated<br>
-Returns:&nbsp;&nbsp;&nbsp;None<br>
-</span>
-<hr style="width: 100%; height: 2px;"><br>
-GMSL has a number of environment variables (or command-line overrides)
-that control various bits of functionality:<br>
-<br>
-<table style="text-align: left;" border="1" cellpadding="2" cellspacing="2">
-  <tbody>
-    <tr>
-      <td><span style="font-style: italic;">Variable</span><br>
-      </td>
-      <td><span style="font-style: italic;">Purpose</span><br>
-      </td>
-    </tr>
-    <tr>
-      <td><span style="font-family: monospace;">GMSL_NO_WARNINGS</span><br>
-      </td>
-      <td>If set prevents GMSL from outputting warning messages:
-artithmetic functions generate underflow warnings.<br>
-      </td>
-    </tr>
-    <tr>
-      <td><span style="font-family: monospace;">GMSL_NO_ERRORS</span><br>
-      </td>
-      <td>If set prevents GMSL from generating fatal errors: division
-by zero or failed assertions are fatal.<br>
-      </td>
-    </tr>
-    <tr>
-      <td><span style="font-family: monospace;">GMSL_TRACE</span><br>
-      </td>
-      <td>Enables function tracing.&nbsp; Calls to GMSL functions will
-result in name and arguments being traced.<br>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<span style="font-family: monospace;"></span><br>
-<hr>
-Copyright (c) 2005-2006 <a href="http://www.jgc.org/">John Graham-Cumming</a>.<br>
-<hr style="width: 100%; height: 2px;">
-<table style="width: 100%; text-align: left;" border="0" cellpadding="2" cellspacing="2">
-  <tbody>
-    <tr>
-      <td style="width: 50%;">John Graham-Cumming's work on this
-project was sponsored by <a href="http://www.electric-cloud.com/">Electric
-Cloud, Inc</a>.<br>
-      <a href="http://www.electric-cloud.com/"><img alt="" src="http://gmsl.sf.net/ec_logo.gif" style="border: 0px solid ; width: 223px; height: 47px;"></a><br>
-      </td>
-      <td align="right">
-      <p><a href="http://sourceforge.net/"><img src="http://sourceforge.net/sflogo.php?group_id=129887&amp;type=1" alt="SourceForge.net Logo" border="0" height="31" width="88"></a></p>
-      </td>
-    </tr>
-  </tbody>
-</table>
-</body></html>
diff --git a/ndk/build/host-setup.sh b/ndk/build/host-setup.sh
deleted file mode 100755
index a29cf84..0000000
--- a/ndk/build/host-setup.sh
+++ /dev/null
@@ -1,247 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2009 The Android Open Source Project
-#
-# 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.
-#
-#  A shell script used to configure the host-specific parts of the NDK
-#  build system. This will create out/host/config-host.make based on
-#  your host system and additionnal command-line options.
-#
-
-# check that this script is run from the top-level NDK directory
-if [ ! -f build/core/ndk-common.sh ] ; then
-    echo "Please run this script from the top-level NDK directory as in:"
-    echo "   cd \$NDKROOT"
-    echo "   build/host-setup.sh"
-    exit 1
-fi
-
-# include common function and variable definitions
-. `dirname $0`/core/ndk-common.sh
-
-OUT_DIR=out
-HOST_CONFIG=$OUT_DIR/host/config.mk
-
-## Build configuration file support
-## you must define $config_mk before calling this function
-##
-create_config_mk ()
-{
-    # create the directory if needed
-    local  config_dir
-    config_mk=${config_mk:-$HOST_CONFIG}
-    config_dir=`dirname $config_mk`
-    mkdir -p $config_dir 2> $TMPL
-    if [ $? != 0 ] ; then
-        echo "Can't create directory for host config file: $config_dir"
-        exit 1
-    fi
-
-    # re-create the start of the configuration file
-    log "Generate   : $config_mk"
-
-    echo "# This file was autogenerated by $PROGNAME. Do not edit !" > $config_mk
-}
-
-add_config ()
-{
-    echo "$1" >> $config_mk
-}
-
-# assume $1 points to a GNU Make executable, and extract version number
-# to verify its a least what we need
-check_gnu_make_version ()
-{
-    if [ -n "$GNU_MAKE" ] ; then
-        return
-    fi
-
-    log2 "  looking for GNU Make as '$1'"
-    local executable=`which $1`
-    if [ -z "$executable" ] ; then
-        log2 "    Not available."
-        return
-    fi
-
-    # I'd love to do the version extraction with awk, but I'm unsure it is
-    # part of the default Cygwin install, so don't bring the dependency
-    # and rely on dumb tools instead.
-    #
-    local version major minor
-    version=`$executable --version | grep "GNU Make"`
-    if [ -z "$version" ] ; then
-        log2 "    Not a GNU Make executable."
-        return
-    fi
-    version=`echo $version | sed -e 's/^GNU Make \([0-9\.]*\).*$/\1/g'`
-    log2 "    Found version $version"
-    major=`echo $version | sed -e 's/\([0-9]*\)\..*/\1/g'`
-    minor=`echo $version | sed -e 's/[0-9]*\.\(.*\)/\1/g'`
-    if [ "$major" -lt "3" ] ; then
-        log2 "    Major version too small ($major.$minor < 3.81)."
-        return
-    fi
-    if [ "$major" -eq "3" -a $minor -lt 80 ] ; then
-        log2 "    Minor version too small ($major.$minor < 3.81)."
-        return
-    fi
-    GNU_MAKE=$1
-    GNU_MAKE_VERSION=$version
-}
-
-# check that $1 points to an awk executable that has a working
-# match() function. This really means Nawk or GNU Awk, which should
-# be installed on all modern distributions, but hey, you never know...
-check_awk ()
-{
-    if [ -n "$AWK" ] ; then
-        return
-    fi
-    log2 "  looking for nawk/gawk as '$1'"
-    local executable=`which $1`
-    if [ -z "$executable" ] ; then
-        log2 "    Not available."
-        return
-    fi
-    local result
-    result=`echo "" | $executable -f build/check-awk.awk`
-    if [ "$result" = "Pass" ] ; then
-        AWK="$1"
-    fi
-    log2 "    Check $result"
-}
-
-OPTION_HELP=no
-OPTION_NO_MAKE_CHECK=no
-OPTION_NO_AWK_CHECK=no
-
-for opt do
-  optarg=`expr "x$opt" : 'x[^=]*=\(.*\)'`
-  case "$opt" in
-  --help|-h|-\?) OPTION_HELP=yes
-  ;;
-  --no-make-check) OPTION_NO_MAKE_CHECK=yes
-  ;;
-  --no-awk-check) OPTION_NO_AWK_CHECK=yes
-  ;;
-  --verbose)
-    if [ "$VERBOSE" = "yes" ] ; then
-        VERBOSE2=yes
-    else
-        VERBOSE=yes
-    fi
-  ;;
-  *)
-    echo "unknown option '$opt', use --help"
-    exit 1
-  esac
-done
-
-if [ $OPTION_HELP = yes ] ; then
-    echo "Usage: build/host-setup.sh [options]"
-    echo ""
-    echo "This script is used to check your host development environment"
-    echo "to ensure that the Android NDK will work correctly with it."
-    echo ""
-    echo "Options: [defaults in brackets after descriptions]"
-    echo ""
-    echo "  --help            Print this help message"
-    echo "  --verbose         Enable verbose mode"
-    echo "  --no-make-check   Ignore GNU Make version check"
-    echo "  --no-awk-check    Ignore Nawk/Gawk check"
-    echo ""
-    exit 1
-fi
-
-
-echo "Checking host development environment."
-echo "NDK Root   : $ANDROID_NDK_ROOT"
-
-## Check for GNU Make with a proper version number
-##
-if [ "$OPTION_NO_MAKE_CHECK" = "no" ] ; then
-    GNU_MAKE=
-    check_gnu_make_version make
-    check_gnu_make_version gmake
-    if [ -z "$GNU_MAKE" ] ; then
-        echo "ERROR: Could not find a valid GNU Make executable."
-        echo "       Please ensure GNU Make 3.81 or later is installed."
-        echo "       Use the --no-make-check option to ignore this message."
-        exit 1
-    fi
-    echo "GNU Make   : $GNU_MAKE (version $GNU_MAKE_VERSION)"
-else
-    echo "GNU Make   : Check ignored through user option."
-fi
-
-## Check for nawk or gawk, straight awk doesn't have the 'match'
-## function we need in the build system.
-##
-if [ "$OPTION_NO_AWK_CHECK" = "no" ] ; then
-    AWK=
-    check_awk awk
-    check_awk gawk
-    check_awk nawk
-    if [ -z "$AWK" ] ; then
-        echo "ERROR: Could not find a valid Nawk or Gawk executable."
-        echo "       Please ensure that either one of them is installed."
-        echo "       Use the --no-awk-check option to ignore this message."
-        exit 1
-    fi
-    echo "Awk        : $AWK"
-else
-    echo "Awk        : Check ignored through user option."
-fi
-
-## Check the host platform tag that will be used to locate prebuilt
-## toolchain binaries. And create configuration file.
-##
-force_32bit_binaries
-echo "Platform   : $HOST_TAG"
-
-create_config_mk
-add_config "HOST_OS       := $HOST_OS"
-add_config "HOST_ARCH     := $HOST_ARCH"
-add_config "HOST_TAG      := $HOST_TAG"
-add_config "HOST_AWK      := $AWK"
-
-## Check that the toolchains we need are installed
-## Otherwise, instruct the user to download them from the web site
-
-TOOLCHAINS=arm-eabi-4.2.1
-
-for tc in $TOOLCHAINS; do
-    echo "Toolchain  : Checking for $tc prebuilt binaries"
-    PREBUILT_BIN=build/prebuilt/$HOST_TAG/$tc/bin
-    log2 "Toolchain  : Cross-compiler in <NDK>/$PREBUILT_BIN ?"
-    COMPILER_PATTERN=$ANDROID_NDK_ROOT/$PREBUILT_BIN/*-gcc$HOST_EXE
-    COMPILERS=`ls $COMPILER_PATTERN 2> /dev/null`
-    if [ -z $COMPILERS ] ; then
-        echo ""
-        echo "ERROR: Toolchain compiler not found"
-        echo "It seems you do not have the correct $tc toolchain binaries."
-        echo "This may be the result of incorrect unzipping of the NDK archive."
-        echo "Please go to the official Android NDK web site and download the"
-        echo "appropriate NDK package for your platform ($HOST_TAG)."
-        echo "See http://developer.android.com/sdk/index.html"
-        echo ""
-        echo "ABORTING."
-        echo ""
-        exit 1
-    fi
-done
-
-echo ""
-echo "Host setup complete. Please read docs/OVERVIEW.TXT if you don't know what to do."
-echo ""
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/alloca.h b/ndk/build/platforms/android-3/arch-arm/usr/include/alloca.h
deleted file mode 100644
index 0c50fc3..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/alloca.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef _ALLOCA_H
-#define _ALLOCA_H
-
-#define alloca(size)   __builtin_alloca(size)
-
-#endif /* _ALLOCA_H */
-
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/android/log.h b/ndk/build/platforms/android-3/arch-arm/usr/include/android/log.h
deleted file mode 100644
index 0ea4c29..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/android/log.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * 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 _ANDROID_LOG_H
-#define _ANDROID_LOG_H
-
-/******************************************************************
- *
- * IMPORTANT NOTICE:
- *
- *   This file is part of Android's set of stable system headers
- *   exposed by the Android NDK (Native Development Kit) since
- *   platform release 1.5
- *
- *   Third-party source AND binary code relies on the definitions
- *   here to be FROZEN ON ALL UPCOMING PLATFORM RELEASES.
- *
- *   - DO NOT MODIFY ENUMS (EXCEPT IF YOU ADD NEW 32-BIT VALUES)
- *   - DO NOT MODIFY CONSTANTS OR FUNCTIONAL MACROS
- *   - DO NOT CHANGE THE SIGNATURE OF FUNCTIONS IN ANY WAY
- *   - DO NOT CHANGE THE LAYOUT OR SIZE OF STRUCTURES
- */
-
-/*
- * Support routines to send messages to the Android in-kernel log buffer,
- * which can later be accessed through the 'logcat' utility.
- *
- * Each log message must have
- *   - a priority
- *   - a log tag
- *   - some text
- *
- * The tag normally corresponds to the component that emits the log message,
- * and should be reasonably small.
- *
- * Log message text may be truncated to less than an implementation-specific
- * limit (e.g. 1023 characters max).
- *
- * Note that a newline character ("\n") will be appended automatically to your
- * log message, if not already there. It is not possible to send several messages
- * and have them appear on a single line in logcat.
- *
- * PLEASE USE LOGS WITH MODERATION:
- *
- *  - Sending log messages eats CPU and slow down your application and the
- *    system.
- *
- *  - The circular log buffer is pretty small (<64KB), sending many messages
- *    might push off other important log messages from the rest of the system.
- *
- *  - In release builds, only send log messages to account for exceptional
- *    conditions.
- *
- * NOTE: These functions MUST be implemented by /system/lib/liblog.so
- */
-
-#include <stdarg.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Android log priority values, in ascending priority order.
- */
-typedef enum android_LogPriority {
-    ANDROID_LOG_UNKNOWN = 0,
-    ANDROID_LOG_DEFAULT,    /* only for SetMinPriority() */
-    ANDROID_LOG_VERBOSE,
-    ANDROID_LOG_DEBUG,
-    ANDROID_LOG_INFO,
-    ANDROID_LOG_WARN,
-    ANDROID_LOG_ERROR,
-    ANDROID_LOG_FATAL,
-    ANDROID_LOG_SILENT,     /* only for SetMinPriority(); must be last */
-} android_LogPriority;
-
-/*
- * Send a simple string to the log.
- */
-int __android_log_write(int prio, const char *tag, const char *text);
-
-/*
- * Send a formatted string to the log, used like printf(fmt,...)
- */
-int __android_log_print(int prio, const char *tag,  const char *fmt, ...)
-#if defined(__GNUC__)
-    __attribute__ ((format(printf, 3, 4)))
-#endif
-    ;
-
-/*
- * A variant of __android_log_print() that takes a va_list to list
- * additional parameters.
- */
-int __android_log_vprint(int prio, const char *tag,
-                         const char *fmt, va_list ap);
-
-/*
- * Log an assertion failure and SIGTRAP the process to have a chance
- * to inspect it, if a debugger is attached. This uses the FATAL priority.
- */
-void __android_log_assert(const char *cond, const char *tag,
-			  const char *fmt, ...)    
-#if defined(__GNUC__)
-    __attribute__ ((noreturn))
-    __attribute__ ((format(printf, 3, 4)))
-#endif
-    ;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ANDROID_LOG_H */
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/arm/fenv.h b/ndk/build/platforms/android-3/arch-arm/usr/include/arm/fenv.h
deleted file mode 100644
index e7a8860..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/arm/fenv.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*-
- * Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/msun/arm/fenv.h,v 1.5 2005/03/16 19:03:45 das Exp $
- */
-
-#ifndef	_FENV_H_
-#define	_FENV_H_
-
-#include <sys/_types.h>
-
-typedef	__uint32_t	fenv_t;
-typedef	__uint32_t	fexcept_t;
-
-/* Exception flags */
-#define	FE_INVALID	0x0001
-#define	FE_DIVBYZERO	0x0002
-#define	FE_OVERFLOW	0x0004
-#define	FE_UNDERFLOW	0x0008
-#define	FE_INEXACT	0x0010
-#define	FE_ALL_EXCEPT	(FE_DIVBYZERO | FE_INEXACT | \
-			 FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW)
-
-/* Rounding modes */
-#define	FE_TONEAREST	0x0000
-#define	FE_TOWARDZERO	0x0001
-#define	FE_UPWARD	0x0002
-#define	FE_DOWNWARD	0x0003
-#define	_ROUND_MASK	(FE_TONEAREST | FE_DOWNWARD | \
-			 FE_UPWARD | FE_TOWARDZERO)
-__BEGIN_DECLS
-
-/* Default floating-point environment */
-extern const fenv_t	__fe_dfl_env;
-#define	FE_DFL_ENV	(&__fe_dfl_env)
-
-/* We need to be able to map status flag positions to mask flag positions */
-#define _FPUSW_SHIFT	16
-#define	_ENABLE_MASK	(FE_ALL_EXCEPT << _FPUSW_SHIFT)
-
-#ifdef	ARM_HARD_FLOAT
-#define	__rfs(__fpsr)	__asm __volatile("rfs %0" : "=r" (*(__fpsr)))
-#define	__wfs(__fpsr)	__asm __volatile("wfs %0" : : "r" (__fpsr))
-#else
-#define __rfs(__fpsr)
-#define __wfs(__fpsr)
-#endif
-
-static __inline int
-feclearexcept(int __excepts)
-{
-	fexcept_t __fpsr;
-
-	__rfs(&__fpsr);
-	__fpsr &= ~__excepts;
-	__wfs(__fpsr);
-	return (0);
-}
-
-static __inline int
-fegetexceptflag(fexcept_t *__flagp, int __excepts)
-{
-	fexcept_t __fpsr;
-
-	__rfs(&__fpsr);
-	*__flagp = __fpsr & __excepts;
-	return (0);
-}
-
-static __inline int
-fesetexceptflag(const fexcept_t *__flagp, int __excepts)
-{
-	fexcept_t __fpsr;
-
-	__rfs(&__fpsr);
-	__fpsr &= ~__excepts;
-	__fpsr |= *__flagp & __excepts;
-	__wfs(__fpsr);
-	return (0);
-}
-
-static __inline int
-feraiseexcept(int __excepts)
-{
-	fexcept_t __ex = __excepts;
-
-	fesetexceptflag(&__ex, __excepts);	/* XXX */
-	return (0);
-}
-
-static __inline int
-fetestexcept(int __excepts)
-{
-	fexcept_t __fpsr;
-
-	__rfs(&__fpsr);
-	return (__fpsr & __excepts);
-}
-
-static __inline int
-fegetround(void)
-{
-
-	/*
-	 * Apparently, the rounding mode is specified as part of the
-	 * instruction format on ARM, so the dynamic rounding mode is
-	 * indeterminate.  Some FPUs may differ.
-	 */
-	return (-1);
-}
-
-static __inline int
-fesetround(int __round)
-{
-
-	return (-1);
-}
-
-static __inline int
-fegetenv(fenv_t *__envp)
-{
-
-	__rfs(__envp);
-	return (0);
-}
-
-static __inline int
-feholdexcept(fenv_t *__envp)
-{
-	fenv_t __env;
-
-	__rfs(&__env);
-	*__envp = __env;
-	__env &= ~(FE_ALL_EXCEPT | _ENABLE_MASK);
-	__wfs(__env);
-	return (0);
-}
-
-static __inline int
-fesetenv(const fenv_t *__envp)
-{
-
-	__wfs(*__envp);
-	return (0);
-}
-
-static __inline int
-feupdateenv(const fenv_t *__envp)
-{
-	fexcept_t __fpsr;
-
-	__rfs(&__fpsr);
-	__wfs(*__envp);
-	feraiseexcept(__fpsr & FE_ALL_EXCEPT);
-	return (0);
-}
-
-#if __BSD_VISIBLE
-
-static __inline int
-feenableexcept(int __mask)
-{
-	fenv_t __old_fpsr, __new_fpsr;
-
-	__rfs(&__old_fpsr);
-	__new_fpsr = __old_fpsr | (__mask & FE_ALL_EXCEPT) << _FPUSW_SHIFT;
-	__wfs(__new_fpsr);
-	return ((__old_fpsr >> _FPUSW_SHIFT) & FE_ALL_EXCEPT);
-}
-
-static __inline int
-fedisableexcept(int __mask)
-{
-	fenv_t __old_fpsr, __new_fpsr;
-
-	__rfs(&__old_fpsr);
-	__new_fpsr = __old_fpsr & ~((__mask & FE_ALL_EXCEPT) << _FPUSW_SHIFT);
-	__wfs(__new_fpsr);
-	return ((__old_fpsr >> _FPUSW_SHIFT) & FE_ALL_EXCEPT);
-}
-
-static __inline int
-fegetexcept(void)
-{
-	fenv_t __fpsr;
-
-	__rfs(&__fpsr);
-	return ((__fpsr & _ENABLE_MASK) >> _FPUSW_SHIFT);
-}
-
-#endif /* __BSD_VISIBLE */
-
-__END_DECLS
-
-#endif	/* !_FENV_H_ */
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/arpa/inet.h b/ndk/build/platforms/android-3/arch-arm/usr/include/arpa/inet.h
deleted file mode 100644
index 3ebb872..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/arpa/inet.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef _ARPA_INET_H_
-#define _ARPA_INET_H_
-
-#include <stdint.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <netinet/in6.h>
-
-__BEGIN_DECLS
-
-typedef uint32_t in_addr_t;
-
-extern uint32_t      inet_addr(const char *);
-
-extern int           inet_aton(const char *, struct in_addr *);
-extern char*         inet_ntoa(struct in_addr);
-
-extern int           inet_pton(int, const char *, void *);
-extern const char*   inet_ntop(int, const void *, char *, size_t);
-
-extern unsigned int  inet_nsap_addr(const char *, unsigned char *, int);
-extern char*         inet_nsap_ntoa(int, const unsigned char *, char *);
-
-__END_DECLS
-
-#endif /* _ARPA_INET_H_ */
-
-
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/arpa/nameser.h b/ndk/build/platforms/android-3/arch-arm/usr/include/arpa/nameser.h
deleted file mode 100644
index 028eadc..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/arpa/nameser.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef _arpa_nameser_h
-#define _arpa_nameser_h
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-/* this header intentionally blank
- *
- * the definitions normally found in <arpa/nameser.h> are
- * really a bunch of resolver's internal declarations that
- * should not be exposed to client code in any way
- */
-
-#endif /* _arpa_nameser_h */
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/4level-fixup.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/4level-fixup.h
deleted file mode 100644
index 91ae7f4..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/4level-fixup.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _4LEVEL_FIXUP_H
-#define _4LEVEL_FIXUP_H
-
-#define __ARCH_HAS_4LEVEL_HACK
-#define __PAGETABLE_PUD_FOLDED
-
-#define PUD_SIZE PGDIR_SIZE
-#define PUD_MASK PGDIR_MASK
-#define PTRS_PER_PUD 1
-
-#define pud_t pgd_t
-
-#define pmd_alloc(mm, pud, address)   ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))?   NULL: pmd_offset(pud, address))
-
-#define pud_alloc(mm, pgd, address) (pgd)
-#define pud_offset(pgd, start) (pgd)
-#define pud_none(pud) 0
-#define pud_bad(pud) 0
-#define pud_present(pud) 1
-#define pud_ERROR(pud) do { } while (0)
-#define pud_clear(pud) pgd_clear(pud)
-
-#undef pud_free_tlb
-#define pud_free_tlb(tlb, x) do { } while (0)
-#define pud_free(x) do { } while (0)
-#define __pud_free_tlb(tlb, x) do { } while (0)
-
-#undef pud_addr_end
-#define pud_addr_end(addr, end) (end)
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/audit_dir_write.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/audit_dir_write.h
deleted file mode 100644
index 1327b59..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/audit_dir_write.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/__ffs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/__ffs.h
deleted file mode 100644
index 3d135bd..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/__ffs.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BITOPS___FFS_H_
-#define _ASM_GENERIC_BITOPS___FFS_H_
-
-#include <asm/types.h>
-
-#if BITS_PER_LONG == 64
-#endif
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/atomic.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/atomic.h
deleted file mode 100644
index 5f53ba9..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/atomic.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BITOPS_ATOMIC_H_
-#define _ASM_GENERIC_BITOPS_ATOMIC_H_
-
-#include <asm/types.h>
-
-#define BITOP_MASK(nr) (1UL << ((nr) % BITS_PER_LONG))
-#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG)
-
-#define _atomic_spin_lock_irqsave(l,f) do { local_irq_save(f); } while (0)
-#define _atomic_spin_unlock_irqrestore(l,f) do { local_irq_restore(f); } while (0)
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/ffz.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/ffz.h
deleted file mode 100644
index 18da271..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/ffz.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BITOPS_FFZ_H_
-#define _ASM_GENERIC_BITOPS_FFZ_H_
-
-#define ffz(x) __ffs(~(x))
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/find.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/find.h
deleted file mode 100644
index 8361cfe..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/find.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BITOPS_FIND_H_
-#define _ASM_GENERIC_BITOPS_FIND_H_
-
-#define find_first_bit(addr, size) find_next_bit((addr), (size), 0)
-#define find_first_zero_bit(addr, size) find_next_zero_bit((addr), (size), 0)
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/fls.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/fls.h
deleted file mode 100644
index 8adbf31..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/fls.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BITOPS_FLS_H_
-#define _ASM_GENERIC_BITOPS_FLS_H_
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/fls64.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/fls64.h
deleted file mode 100644
index af77098..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/fls64.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BITOPS_FLS64_H_
-#define _ASM_GENERIC_BITOPS_FLS64_H_
-
-#include <asm/types.h>
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/le.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/le.h
deleted file mode 100644
index 97ca973..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/le.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BITOPS_LE_H_
-#define _ASM_GENERIC_BITOPS_LE_H_
-
-#include <asm/types.h>
-#include <asm/byteorder.h>
-
-#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG)
-#define BITOP_LE_SWIZZLE ((BITS_PER_LONG-1) & ~0x7)
-
-#ifdef __LITTLE_ENDIAN
-
-#define generic_test_le_bit(nr, addr) test_bit(nr, addr)
-#define generic___set_le_bit(nr, addr) __set_bit(nr, addr)
-#define generic___clear_le_bit(nr, addr) __clear_bit(nr, addr)
-
-#define generic_test_and_set_le_bit(nr, addr) test_and_set_bit(nr, addr)
-#define generic_test_and_clear_le_bit(nr, addr) test_and_clear_bit(nr, addr)
-
-#define generic___test_and_set_le_bit(nr, addr) __test_and_set_bit(nr, addr)
-#define generic___test_and_clear_le_bit(nr, addr) __test_and_clear_bit(nr, addr)
-
-#define generic_find_next_zero_le_bit(addr, size, offset) find_next_zero_bit(addr, size, offset)
-
-#elif defined(__BIG_ENDIAN)
-
-#define generic_test_le_bit(nr, addr)   test_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-#define generic___set_le_bit(nr, addr)   __set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-#define generic___clear_le_bit(nr, addr)   __clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-
-#define generic_test_and_set_le_bit(nr, addr)   test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-#define generic_test_and_clear_le_bit(nr, addr)   test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-
-#define generic___test_and_set_le_bit(nr, addr)   __test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-#define generic___test_and_clear_le_bit(nr, addr)   __test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-
-#define generic_find_first_zero_le_bit(addr, size)   generic_find_next_zero_le_bit((addr), (size), 0)
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/non-atomic.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/non-atomic.h
deleted file mode 100644
index 727f736..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/non-atomic.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BITOPS_NON_ATOMIC_H_
-#define _ASM_GENERIC_BITOPS_NON_ATOMIC_H_
-
-#include <asm/types.h>
-
-#define BITOP_MASK(nr) (1UL << ((nr) % BITS_PER_LONG))
-#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG)
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bug.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bug.h
deleted file mode 100644
index d91a135..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/bug.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BUG_H
-#define _ASM_GENERIC_BUG_H
-
-#include <linux/compiler.h>
-
-#ifndef HAVE_ARCH_BUG
-#define BUG()
-#endif
-
-#ifndef HAVE_ARCH_BUG_ON
-#define BUG_ON(condition) do { if (condition) ; } while(0)
-#endif
-
-#ifndef HAVE_ARCH_WARN_ON
-#define WARN_ON(condition) do { if (condition) ; } while(0)
-#endif
-
-#define WARN_ON_ONCE(condition)  ({   static int __warn_once = 1;   int __ret = 0;     if (unlikely((condition) && __warn_once)) {   __warn_once = 0;   WARN_ON(1);   __ret = 1;   }   __ret;  })
-
-#define WARN_ON_SMP(x) do { } while (0)
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/cputime.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/cputime.h
deleted file mode 100644
index 0486b87..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/cputime.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_CPUTIME_H
-#define _ASM_GENERIC_CPUTIME_H
-
-#include <linux/time.h>
-#include <linux/jiffies.h>
-
-typedef unsigned long cputime_t;
-
-#define cputime_zero (0UL)
-#define cputime_max ((~0UL >> 1) - 1)
-#define cputime_add(__a, __b) ((__a) + (__b))
-#define cputime_sub(__a, __b) ((__a) - (__b))
-#define cputime_div(__a, __n) ((__a) / (__n))
-#define cputime_halve(__a) ((__a) >> 1)
-#define cputime_eq(__a, __b) ((__a) == (__b))
-#define cputime_gt(__a, __b) ((__a) > (__b))
-#define cputime_ge(__a, __b) ((__a) >= (__b))
-#define cputime_lt(__a, __b) ((__a) < (__b))
-#define cputime_le(__a, __b) ((__a) <= (__b))
-#define cputime_to_jiffies(__ct) (__ct)
-#define jiffies_to_cputime(__hz) (__hz)
-
-typedef u64 cputime64_t;
-
-#define cputime64_zero (0ULL)
-#define cputime64_add(__a, __b) ((__a) + (__b))
-#define cputime64_sub(__a, __b) ((__a) - (__b))
-#define cputime64_to_jiffies64(__ct) (__ct)
-#define jiffies64_to_cputime64(__jif) (__jif)
-#define cputime_to_cputime64(__ct) ((u64) __ct)
-
-#define cputime_to_msecs(__ct) jiffies_to_msecs(__ct)
-#define msecs_to_cputime(__msecs) msecs_to_jiffies(__msecs)
-
-#define cputime_to_secs(jif) ((jif) / HZ)
-#define secs_to_cputime(sec) ((sec) * HZ)
-
-#define timespec_to_cputime(__val) timespec_to_jiffies(__val)
-#define cputime_to_timespec(__ct,__val) jiffies_to_timespec(__ct,__val)
-
-#define timeval_to_cputime(__val) timeval_to_jiffies(__val)
-#define cputime_to_timeval(__ct,__val) jiffies_to_timeval(__ct,__val)
-
-#define cputime_to_clock_t(__ct) jiffies_to_clock_t(__ct)
-#define clock_t_to_cputime(__x) clock_t_to_jiffies(__x)
-
-#define cputime64_to_clock_t(__ct) jiffies_64_to_clock_t(__ct)
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/emergency-restart.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/emergency-restart.h
deleted file mode 100644
index 619c682..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/emergency-restart.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
-#define _ASM_GENERIC_EMERGENCY_RESTART_H
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/errno-base.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/errno-base.h
deleted file mode 100644
index 2fb4a33..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/errno-base.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_ERRNO_BASE_H
-#define _ASM_GENERIC_ERRNO_BASE_H
-
-#define EPERM 1  
-#define ENOENT 2  
-#define ESRCH 3  
-#define EINTR 4  
-#define EIO 5  
-#define ENXIO 6  
-#define E2BIG 7  
-#define ENOEXEC 8  
-#define EBADF 9  
-#define ECHILD 10  
-#define EAGAIN 11  
-#define ENOMEM 12  
-#define EACCES 13  
-#define EFAULT 14  
-#define ENOTBLK 15  
-#define EBUSY 16  
-#define EEXIST 17  
-#define EXDEV 18  
-#define ENODEV 19  
-#define ENOTDIR 20  
-#define EISDIR 21  
-#define EINVAL 22  
-#define ENFILE 23  
-#define EMFILE 24  
-#define ENOTTY 25  
-#define ETXTBSY 26  
-#define EFBIG 27  
-#define ENOSPC 28  
-#define ESPIPE 29  
-#define EROFS 30  
-#define EMLINK 31  
-#define EPIPE 32  
-#define EDOM 33  
-#define ERANGE 34  
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/errno.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/errno.h
deleted file mode 100644
index 11dd00f..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/errno.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_ERRNO_H
-#define _ASM_GENERIC_ERRNO_H
-
-#include <asm-generic/errno-base.h>
-
-#define EDEADLK 35  
-#define ENAMETOOLONG 36  
-#define ENOLCK 37  
-#define ENOSYS 38  
-#define ENOTEMPTY 39  
-#define ELOOP 40  
-#define EWOULDBLOCK EAGAIN  
-#define ENOMSG 42  
-#define EIDRM 43  
-#define ECHRNG 44  
-#define EL2NSYNC 45  
-#define EL3HLT 46  
-#define EL3RST 47  
-#define ELNRNG 48  
-#define EUNATCH 49  
-#define ENOCSI 50  
-#define EL2HLT 51  
-#define EBADE 52  
-#define EBADR 53  
-#define EXFULL 54  
-#define ENOANO 55  
-#define EBADRQC 56  
-#define EBADSLT 57  
-
-#define EDEADLOCK EDEADLK
-
-#define EBFONT 59  
-#define ENOSTR 60  
-#define ENODATA 61  
-#define ETIME 62  
-#define ENOSR 63  
-#define ENONET 64  
-#define ENOPKG 65  
-#define EREMOTE 66  
-#define ENOLINK 67  
-#define EADV 68  
-#define ESRMNT 69  
-#define ECOMM 70  
-#define EPROTO 71  
-#define EMULTIHOP 72  
-#define EDOTDOT 73  
-#define EBADMSG 74  
-#define EOVERFLOW 75  
-#define ENOTUNIQ 76  
-#define EBADFD 77  
-#define EREMCHG 78  
-#define ELIBACC 79  
-#define ELIBBAD 80  
-#define ELIBSCN 81  
-#define ELIBMAX 82  
-#define ELIBEXEC 83  
-#define EILSEQ 84  
-#define ERESTART 85  
-#define ESTRPIPE 86  
-#define EUSERS 87  
-#define ENOTSOCK 88  
-#define EDESTADDRREQ 89  
-#define EMSGSIZE 90  
-#define EPROTOTYPE 91  
-#define ENOPROTOOPT 92  
-#define EPROTONOSUPPORT 93  
-#define ESOCKTNOSUPPORT 94  
-#define EOPNOTSUPP 95  
-#define EPFNOSUPPORT 96  
-#define EAFNOSUPPORT 97  
-#define EADDRINUSE 98  
-#define EADDRNOTAVAIL 99  
-#define ENETDOWN 100  
-#define ENETUNREACH 101  
-#define ENETRESET 102  
-#define ECONNABORTED 103  
-#define ECONNRESET 104  
-#define ENOBUFS 105  
-#define EISCONN 106  
-#define ENOTCONN 107  
-#define ESHUTDOWN 108  
-#define ETOOMANYREFS 109  
-#define ETIMEDOUT 110  
-#define ECONNREFUSED 111  
-#define EHOSTDOWN 112  
-#define EHOSTUNREACH 113  
-#define EALREADY 114  
-#define EINPROGRESS 115  
-#define ESTALE 116  
-#define EUCLEAN 117  
-#define ENOTNAM 118  
-#define ENAVAIL 119  
-#define EISNAM 120  
-#define EREMOTEIO 121  
-#define EDQUOT 122  
-
-#define ENOMEDIUM 123  
-#define EMEDIUMTYPE 124  
-#define ECANCELED 125  
-#define ENOKEY 126  
-#define EKEYEXPIRED 127  
-#define EKEYREVOKED 128  
-#define EKEYREJECTED 129  
-
-#define EOWNERDEAD 130  
-#define ENOTRECOVERABLE 131  
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/fcntl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/fcntl.h
deleted file mode 100644
index a53b536..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/fcntl.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_FCNTL_H
-#define _ASM_GENERIC_FCNTL_H
-
-#include <linux/types.h>
-
-#define O_ACCMODE 00000003
-#define O_RDONLY 00000000
-#define O_WRONLY 00000001
-#define O_RDWR 00000002
-#ifndef O_CREAT
-#define O_CREAT 00000100  
-#endif
-#ifndef O_EXCL
-#define O_EXCL 00000200  
-#endif
-#ifndef O_NOCTTY
-#define O_NOCTTY 00000400  
-#endif
-#ifndef O_TRUNC
-#define O_TRUNC 00001000  
-#endif
-#ifndef O_APPEND
-#define O_APPEND 00002000
-#endif
-#ifndef O_NONBLOCK
-#define O_NONBLOCK 00004000
-#endif
-#ifndef O_SYNC
-#define O_SYNC 00010000
-#endif
-#ifndef FASYNC
-#define FASYNC 00020000  
-#endif
-#ifndef O_DIRECT
-#define O_DIRECT 00040000  
-#endif
-#ifndef O_LARGEFILE
-#define O_LARGEFILE 00100000
-#endif
-#ifndef O_DIRECTORY
-#define O_DIRECTORY 00200000  
-#endif
-#ifndef O_NOFOLLOW
-#define O_NOFOLLOW 00400000  
-#endif
-#ifndef O_NOATIME
-#define O_NOATIME 01000000
-#endif
-#ifndef O_NDELAY
-#define O_NDELAY O_NONBLOCK
-#endif
-
-#define F_DUPFD 0  
-#define F_GETFD 1  
-#define F_SETFD 2  
-#define F_GETFL 3  
-#define F_SETFL 4  
-#ifndef F_GETLK
-#define F_GETLK 5
-#define F_SETLK 6
-#define F_SETLKW 7
-#endif
-#ifndef F_SETOWN
-#define F_SETOWN 8  
-#define F_GETOWN 9  
-#endif
-#ifndef F_SETSIG
-#define F_SETSIG 10  
-#define F_GETSIG 11  
-#endif
-
-#define FD_CLOEXEC 1  
-
-#ifndef F_RDLCK
-#define F_RDLCK 0
-#define F_WRLCK 1
-#define F_UNLCK 2
-#endif
-
-#ifndef F_EXLCK
-#define F_EXLCK 4  
-#define F_SHLCK 8  
-#endif
-
-#ifndef F_INPROGRESS
-#define F_INPROGRESS 16
-#endif
-
-#define LOCK_SH 1  
-#define LOCK_EX 2  
-#define LOCK_NB 4  
-#define LOCK_UN 8  
-
-#define LOCK_MAND 32  
-#define LOCK_READ 64  
-#define LOCK_WRITE 128  
-#define LOCK_RW 192  
-
-#define F_LINUX_SPECIFIC_BASE 1024
-
-#ifndef HAVE_ARCH_STRUCT_FLOCK
-#ifndef __ARCH_FLOCK_PAD
-#define __ARCH_FLOCK_PAD
-#endif
-
-struct flock {
- short l_type;
- short l_whence;
- off_t l_start;
- off_t l_len;
- pid_t l_pid;
- __ARCH_FLOCK_PAD
-};
-#endif
-
-#ifndef F_GETLK64
-#define F_GETLK64 12  
-#define F_SETLK64 13
-#define F_SETLKW64 14
-#endif
-
-#ifndef HAVE_ARCH_STRUCT_FLOCK64
-#ifndef __ARCH_FLOCK64_PAD
-#define __ARCH_FLOCK64_PAD
-#endif
-
-struct flock64 {
- short l_type;
- short l_whence;
- loff_t l_start;
- loff_t l_len;
- pid_t l_pid;
- __ARCH_FLOCK64_PAD
-};
-#endif
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/futex.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/futex.h
deleted file mode 100644
index 05d3afe..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/futex.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_FUTEX_H
-#define _ASM_GENERIC_FUTEX_H
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/ioctl.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/ioctl.h
deleted file mode 100644
index cba2b8e..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/ioctl.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_IOCTL_H
-#define _ASM_GENERIC_IOCTL_H
-
-#define _IOC_NRBITS 8
-#define _IOC_TYPEBITS 8
-#define _IOC_SIZEBITS 14
-#define _IOC_DIRBITS 2
-
-#define _IOC_NRMASK ((1 << _IOC_NRBITS)-1)
-#define _IOC_TYPEMASK ((1 << _IOC_TYPEBITS)-1)
-#define _IOC_SIZEMASK ((1 << _IOC_SIZEBITS)-1)
-#define _IOC_DIRMASK ((1 << _IOC_DIRBITS)-1)
-
-#define _IOC_NRSHIFT 0
-#define _IOC_TYPESHIFT (_IOC_NRSHIFT+_IOC_NRBITS)
-#define _IOC_SIZESHIFT (_IOC_TYPESHIFT+_IOC_TYPEBITS)
-#define _IOC_DIRSHIFT (_IOC_SIZESHIFT+_IOC_SIZEBITS)
-
-#define _IOC_NONE 0U
-#define _IOC_WRITE 1U
-#define _IOC_READ 2U
-
-#define _IOC(dir,type,nr,size)   (((dir) << _IOC_DIRSHIFT) |   ((type) << _IOC_TYPESHIFT) |   ((nr) << _IOC_NRSHIFT) |   ((size) << _IOC_SIZESHIFT))
-
-extern unsigned int __invalid_size_argument_for_IOC;
-#define _IOC_TYPECHECK(t)   ((sizeof(t) == sizeof(t[1]) &&   sizeof(t) < (1 << _IOC_SIZEBITS)) ?   sizeof(t) : __invalid_size_argument_for_IOC)
-
-#define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0)
-#define _IOR(type,nr,size) _IOC(_IOC_READ,(type),(nr),(_IOC_TYPECHECK(size)))
-#define _IOW(type,nr,size) _IOC(_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
-#define _IOWR(type,nr,size) _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
-#define _IOR_BAD(type,nr,size) _IOC(_IOC_READ,(type),(nr),sizeof(size))
-#define _IOW_BAD(type,nr,size) _IOC(_IOC_WRITE,(type),(nr),sizeof(size))
-#define _IOWR_BAD(type,nr,size) _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size))
-
-#define _IOC_DIR(nr) (((nr) >> _IOC_DIRSHIFT) & _IOC_DIRMASK)
-#define _IOC_TYPE(nr) (((nr) >> _IOC_TYPESHIFT) & _IOC_TYPEMASK)
-#define _IOC_NR(nr) (((nr) >> _IOC_NRSHIFT) & _IOC_NRMASK)
-#define _IOC_SIZE(nr) (((nr) >> _IOC_SIZESHIFT) & _IOC_SIZEMASK)
-
-#define IOC_IN (_IOC_WRITE << _IOC_DIRSHIFT)
-#define IOC_OUT (_IOC_READ << _IOC_DIRSHIFT)
-#define IOC_INOUT ((_IOC_WRITE|_IOC_READ) << _IOC_DIRSHIFT)
-#define IOCSIZE_MASK (_IOC_SIZEMASK << _IOC_SIZESHIFT)
-#define IOCSIZE_SHIFT (_IOC_SIZESHIFT)
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/ipc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/ipc.h
deleted file mode 100644
index 57657a7..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/ipc.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_IPC_H
-#define _ASM_GENERIC_IPC_H
-
-struct ipc_kludge {
- struct msgbuf __user *msgp;
- long msgtyp;
-};
-
-#define SEMOP 1
-#define SEMGET 2
-#define SEMCTL 3
-#define SEMTIMEDOP 4
-#define MSGSND 11
-#define MSGRCV 12
-#define MSGGET 13
-#define MSGCTL 14
-#define SHMAT 21
-#define SHMDT 22
-#define SHMGET 23
-#define SHMCTL 24
-
-#define DIPC 25
-
-#define IPCCALL(version,op) ((version)<<16 | (op))
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/local.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/local.h
deleted file mode 100644
index cae0d54..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/local.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_LOCAL_H
-#define _ASM_GENERIC_LOCAL_H
-
-#include <linux/percpu.h>
-#include <linux/hardirq.h>
-#include <asm/atomic.h>
-#include <asm/types.h>
-
-typedef struct
-{
- atomic_long_t a;
-} local_t;
-
-#define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
-
-#define local_read(l) atomic_long_read(&(l)->a)
-#define local_set(l,i) atomic_long_set((&(l)->a),(i))
-#define local_inc(l) atomic_long_inc(&(l)->a)
-#define local_dec(l) atomic_long_dec(&(l)->a)
-#define local_add(i,l) atomic_long_add((i),(&(l)->a))
-#define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
-
-#define __local_inc(l) local_set((l), local_read(l) + 1)
-#define __local_dec(l) local_set((l), local_read(l) - 1)
-#define __local_add(i,l) local_set((l), local_read(l) + (i))
-#define __local_sub(i,l) local_set((l), local_read(l) - (i))
-
-#define cpu_local_read(v) local_read(&__get_cpu_var(v))
-#define cpu_local_set(v, i) local_set(&__get_cpu_var(v), (i))
-#define cpu_local_inc(v) local_inc(&__get_cpu_var(v))
-#define cpu_local_dec(v) local_dec(&__get_cpu_var(v))
-#define cpu_local_add(i, v) local_add((i), &__get_cpu_var(v))
-#define cpu_local_sub(i, v) local_sub((i), &__get_cpu_var(v))
-
-#define __cpu_local_inc(v) __local_inc(&__get_cpu_var(v))
-#define __cpu_local_dec(v) __local_dec(&__get_cpu_var(v))
-#define __cpu_local_add(i, v) __local_add((i), &__get_cpu_var(v))
-#define __cpu_local_sub(i, v) __local_sub((i), &__get_cpu_var(v))
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/memory_model.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/memory_model.h
deleted file mode 100644
index fa7602e..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/memory_model.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_MEMORY_MODEL_H
-#define __ASM_MEMORY_MODEL_H
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/mman.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/mman.h
deleted file mode 100644
index 98d2783..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/mman.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_MMAN_H
-#define _ASM_GENERIC_MMAN_H
-
-#define PROT_READ 0x1  
-#define PROT_WRITE 0x2  
-#define PROT_EXEC 0x4  
-#define PROT_SEM 0x8  
-#define PROT_NONE 0x0  
-#define PROT_GROWSDOWN 0x01000000  
-#define PROT_GROWSUP 0x02000000  
-
-#define MAP_SHARED 0x01  
-#define MAP_PRIVATE 0x02  
-#define MAP_TYPE 0x0f  
-#define MAP_FIXED 0x10  
-#define MAP_ANONYMOUS 0x20  
-
-#define MS_ASYNC 1  
-#define MS_INVALIDATE 2  
-#define MS_SYNC 4  
-
-#define MADV_NORMAL 0  
-#define MADV_RANDOM 1  
-#define MADV_SEQUENTIAL 2  
-#define MADV_WILLNEED 3  
-#define MADV_DONTNEED 4  
-
-#define MADV_REMOVE 9  
-#define MADV_DONTFORK 10  
-#define MADV_DOFORK 11  
-
-#define MAP_ANON MAP_ANONYMOUS
-#define MAP_FILE 0
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/mutex-xchg.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/mutex-xchg.h
deleted file mode 100644
index 63a557e..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/mutex-xchg.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_MUTEX_XCHG_H
-#define _ASM_GENERIC_MUTEX_XCHG_H
-
-#define __mutex_slowpath_needs_to_unlock() 0
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/percpu.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/percpu.h
deleted file mode 100644
index e498300..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/percpu.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_PERCPU_H_
-#define _ASM_GENERIC_PERCPU_H_
-#include <linux/compiler.h>
-
-#define __GENERIC_PER_CPU
-
-#define DEFINE_PER_CPU(type, name)   __typeof__(type) per_cpu__##name
-
-#define per_cpu(var, cpu) (*((void)(cpu), &per_cpu__##var))
-#define __get_cpu_var(var) per_cpu__##var
-#define __raw_get_cpu_var(var) per_cpu__##var
-
-#define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu__##name
-
-#define EXPORT_PER_CPU_SYMBOL(var) EXPORT_SYMBOL(per_cpu__##var)
-#define EXPORT_PER_CPU_SYMBOL_GPL(var) EXPORT_SYMBOL_GPL(per_cpu__##var)
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/pgtable-nopud.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/pgtable-nopud.h
deleted file mode 100644
index 585f816..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/pgtable-nopud.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _PGTABLE_NOPUD_H
-#define _PGTABLE_NOPUD_H
-
-#ifndef __ASSEMBLY__
-
-#define __PAGETABLE_PUD_FOLDED
-
-typedef struct { pgd_t pgd; } pud_t;
-
-#define PUD_SHIFT PGDIR_SHIFT
-#define PTRS_PER_PUD 1
-#define PUD_SIZE (1UL << PUD_SHIFT)
-#define PUD_MASK (~(PUD_SIZE-1))
-
-#define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
-#define pgd_populate(mm, pgd, pud) do { } while (0)
-#define set_pgd(pgdptr, pgdval) set_pud((pud_t *)(pgdptr), (pud_t) { pgdval })
-#define pud_val(x) (pgd_val((x).pgd))
-#define __pud(x) ((pud_t) { __pgd(x) } )
-#define pgd_page(pgd) (pud_page((pud_t){ pgd }))
-#define pgd_page_kernel(pgd) (pud_page_kernel((pud_t){ pgd }))
-#define pud_alloc_one(mm, address) NULL
-#define pud_free(x) do { } while (0)
-#define __pud_free_tlb(tlb, x) do { } while (0)
-#undef pud_addr_end
-#define pud_addr_end(addr, end) (end)
-#endif
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/pgtable.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/pgtable.h
deleted file mode 100644
index a21cdba..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/pgtable.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_PGTABLE_H
-#define _ASM_GENERIC_PGTABLE_H
-
-#ifndef __HAVE_ARCH_PTEP_ESTABLISH
-
-#ifndef __HAVE_ARCH_SET_PTE_ATOMIC
-#define ptep_establish(__vma, __address, __ptep, __entry)  do {   set_pte_at((__vma)->vm_mm, (__address), __ptep, __entry);   flush_tlb_page(__vma, __address);  } while (0)
-#else
-#define ptep_establish(__vma, __address, __ptep, __entry)  do {   set_pte_atomic(__ptep, __entry);   flush_tlb_page(__vma, __address);  } while (0)
-#endif
-#endif
-
-#ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
-
-#define ptep_set_access_flags(__vma, __address, __ptep, __entry, __dirty)  do {   set_pte_at((__vma)->vm_mm, (__address), __ptep, __entry);   flush_tlb_page(__vma, __address);  } while (0)
-#endif
-
-#ifndef __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
-#define ptep_test_and_clear_young(__vma, __address, __ptep)  ({   pte_t __pte = *(__ptep);   int r = 1;   if (!pte_young(__pte))   r = 0;   else   set_pte_at((__vma)->vm_mm, (__address),   (__ptep), pte_mkold(__pte));   r;  })
-#endif
-
-#ifndef __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH
-#define ptep_clear_flush_young(__vma, __address, __ptep)  ({   int __young;   __young = ptep_test_and_clear_young(__vma, __address, __ptep);   if (__young)   flush_tlb_page(__vma, __address);   __young;  })
-#endif
-
-#ifndef __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
-#define ptep_test_and_clear_dirty(__vma, __address, __ptep)  ({   pte_t __pte = *__ptep;   int r = 1;   if (!pte_dirty(__pte))   r = 0;   else   set_pte_at((__vma)->vm_mm, (__address), (__ptep),   pte_mkclean(__pte));   r;  })
-#endif
-
-#ifndef __HAVE_ARCH_PTEP_CLEAR_DIRTY_FLUSH
-#define ptep_clear_flush_dirty(__vma, __address, __ptep)  ({   int __dirty;   __dirty = ptep_test_and_clear_dirty(__vma, __address, __ptep);   if (__dirty)   flush_tlb_page(__vma, __address);   __dirty;  })
-#endif
-
-#ifndef __HAVE_ARCH_PTEP_GET_AND_CLEAR
-#define ptep_get_and_clear(__mm, __address, __ptep)  ({   pte_t __pte = *(__ptep);   pte_clear((__mm), (__address), (__ptep));   __pte;  })
-#endif
-
-#ifndef __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
-#define ptep_get_and_clear_full(__mm, __address, __ptep, __full)  ({   pte_t __pte;   __pte = ptep_get_and_clear((__mm), (__address), (__ptep));   __pte;  })
-#endif
-
-#ifndef __HAVE_ARCH_PTE_CLEAR_FULL
-#define pte_clear_full(__mm, __address, __ptep, __full)  do {   pte_clear((__mm), (__address), (__ptep));  } while (0)
-#endif
-
-#ifndef __HAVE_ARCH_PTEP_CLEAR_FLUSH
-#define ptep_clear_flush(__vma, __address, __ptep)  ({   pte_t __pte;   __pte = ptep_get_and_clear((__vma)->vm_mm, __address, __ptep);   flush_tlb_page(__vma, __address);   __pte;  })
-#endif
-
-#ifndef __HAVE_ARCH_PTEP_SET_WRPROTECT
-struct mm_struct;
-#endif
-#ifndef __HAVE_ARCH_PTE_SAME
-#define pte_same(A,B) (pte_val(A) == pte_val(B))
-#endif
-#ifndef __HAVE_ARCH_PAGE_TEST_AND_CLEAR_DIRTY
-#define page_test_and_clear_dirty(page) (0)
-#define pte_maybe_dirty(pte) pte_dirty(pte)
-#else
-#define pte_maybe_dirty(pte) (1)
-#endif
-#ifndef __HAVE_ARCH_PAGE_TEST_AND_CLEAR_YOUNG
-#define page_test_and_clear_young(page) (0)
-#endif
-#ifndef __HAVE_ARCH_PGD_OFFSET_GATE
-#define pgd_offset_gate(mm, addr) pgd_offset(mm, addr)
-#endif
-#ifndef __HAVE_ARCH_LAZY_MMU_PROT_UPDATE
-#define lazy_mmu_prot_update(pte) do { } while (0)
-#endif
-#ifndef __HAVE_ARCH_MOVE_PTE
-#define move_pte(pte, prot, old_addr, new_addr) (pte)
-#endif
-#define pgd_addr_end(addr, end)  ({ unsigned long __boundary = ((addr) + PGDIR_SIZE) & PGDIR_MASK;   (__boundary - 1 < (end) - 1)? __boundary: (end);  })
-#ifndef pud_addr_end
-#define pud_addr_end(addr, end)  ({ unsigned long __boundary = ((addr) + PUD_SIZE) & PUD_MASK;   (__boundary - 1 < (end) - 1)? __boundary: (end);  })
-#endif
-#ifndef pmd_addr_end
-#define pmd_addr_end(addr, end)  ({ unsigned long __boundary = ((addr) + PMD_SIZE) & PMD_MASK;   (__boundary - 1 < (end) - 1)? __boundary: (end);  })
-#endif
-#ifndef __ASSEMBLY__
-
-#endif
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/poll.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/poll.h
deleted file mode 100644
index b8cd3da..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/poll.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_GENERIC_POLL_H
-#define __ASM_GENERIC_POLL_H
-
-#define POLLIN 0x0001
-#define POLLPRI 0x0002
-#define POLLOUT 0x0004
-#define POLLERR 0x0008
-#define POLLHUP 0x0010
-#define POLLNVAL 0x0020
-
-#define POLLRDNORM 0x0040
-#define POLLRDBAND 0x0080
-#ifndef POLLWRNORM
-#define POLLWRNORM 0x0100
-#endif
-#ifndef POLLWRBAND
-#define POLLWRBAND 0x0200
-#endif
-#ifndef POLLMSG
-#define POLLMSG 0x0400
-#endif
-#ifndef POLLREMOVE
-#define POLLREMOVE 0x1000
-#endif
-#ifndef POLLRDHUP
-#define POLLRDHUP 0x2000
-#endif
-
-struct pollfd {
- int fd;
- short events;
- short revents;
-};
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/resource.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/resource.h
deleted file mode 100644
index a7f7dec..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/resource.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_RESOURCE_H
-#define _ASM_GENERIC_RESOURCE_H
-
-#define RLIMIT_CPU 0  
-#define RLIMIT_FSIZE 1  
-#define RLIMIT_DATA 2  
-#define RLIMIT_STACK 3  
-#define RLIMIT_CORE 4  
-
-#ifndef RLIMIT_RSS
-#define RLIMIT_RSS 5  
-#endif
-
-#ifndef RLIMIT_NPROC
-#define RLIMIT_NPROC 6  
-#endif
-
-#ifndef RLIMIT_NOFILE
-#define RLIMIT_NOFILE 7  
-#endif
-
-#ifndef RLIMIT_MEMLOCK
-#define RLIMIT_MEMLOCK 8  
-#endif
-
-#ifndef RLIMIT_AS
-#define RLIMIT_AS 9  
-#endif
-
-#define RLIMIT_LOCKS 10  
-#define RLIMIT_SIGPENDING 11  
-#define RLIMIT_MSGQUEUE 12  
-#define RLIMIT_NICE 13  
-#define RLIMIT_RTPRIO 14  
-
-#define RLIM_NLIMITS 15
-
-#ifndef RLIM_INFINITY
-#define RLIM_INFINITY (~0UL)
-#endif
-
-#ifndef _STK_LIM_MAX
-#define _STK_LIM_MAX RLIM_INFINITY
-#endif
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/sections.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/sections.h
deleted file mode 100644
index e9eaa46..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/sections.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_SECTIONS_H_
-#define _ASM_GENERIC_SECTIONS_H_
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/siginfo.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/siginfo.h
deleted file mode 100644
index d6743a7..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/siginfo.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_SIGINFO_H
-#define _ASM_GENERIC_SIGINFO_H
-
-#include <linux/compiler.h>
-#include <linux/types.h>
-
-typedef union sigval {
- int sival_int;
- void __user *sival_ptr;
-} sigval_t;
-
-#ifndef __ARCH_SI_PREAMBLE_SIZE
-#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int))
-#endif
-
-#define SI_MAX_SIZE 128
-#ifndef SI_PAD_SIZE
-#define SI_PAD_SIZE ((SI_MAX_SIZE - __ARCH_SI_PREAMBLE_SIZE) / sizeof(int))
-#endif
-
-#ifndef __ARCH_SI_UID_T
-#define __ARCH_SI_UID_T uid_t
-#endif
-
-#ifndef __ARCH_SI_BAND_T
-#define __ARCH_SI_BAND_T long
-#endif
-
-#ifndef HAVE_ARCH_SIGINFO_T
-
-typedef struct siginfo {
- int si_signo;
- int si_errno;
- int si_code;
-
- union {
- int _pad[SI_PAD_SIZE];
-
- struct {
- pid_t _pid;
- __ARCH_SI_UID_T _uid;
- } _kill;
-
- struct {
- timer_t _tid;
- int _overrun;
- char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
- sigval_t _sigval;
- int _sys_private;
- } _timer;
-
- struct {
- pid_t _pid;
- __ARCH_SI_UID_T _uid;
- sigval_t _sigval;
- } _rt;
-
- struct {
- pid_t _pid;
- __ARCH_SI_UID_T _uid;
- int _status;
- clock_t _utime;
- clock_t _stime;
- } _sigchld;
-
- struct {
- void __user *_addr;
-#ifdef __ARCH_SI_TRAPNO
- int _trapno;
-#endif
- } _sigfault;
-
- struct {
- __ARCH_SI_BAND_T _band;
- int _fd;
- } _sigpoll;
- } _sifields;
-} siginfo_t;
-
-#endif
-
-#define si_pid _sifields._kill._pid
-#define si_uid _sifields._kill._uid
-#define si_tid _sifields._timer._tid
-#define si_overrun _sifields._timer._overrun
-#define si_sys_private _sifields._timer._sys_private
-#define si_status _sifields._sigchld._status
-#define si_utime _sifields._sigchld._utime
-#define si_stime _sifields._sigchld._stime
-#define si_value _sifields._rt._sigval
-#define si_int _sifields._rt._sigval.sival_int
-#define si_ptr _sifields._rt._sigval.sival_ptr
-#define si_addr _sifields._sigfault._addr
-#ifdef __ARCH_SI_TRAPNO
-#define si_trapno _sifields._sigfault._trapno
-#endif
-#define si_band _sifields._sigpoll._band
-#define si_fd _sifields._sigpoll._fd
-
-#define __SI_KILL 0
-#define __SI_TIMER 0
-#define __SI_POLL 0
-#define __SI_FAULT 0
-#define __SI_CHLD 0
-#define __SI_RT 0
-#define __SI_MESGQ 0
-#define __SI_CODE(T,N) (N)
-
-#define SI_USER 0  
-#define SI_KERNEL 0x80  
-#define SI_QUEUE -1  
-#define SI_TIMER __SI_CODE(__SI_TIMER,-2)  
-#define SI_MESGQ __SI_CODE(__SI_MESGQ,-3)  
-#define SI_ASYNCIO -4  
-#define SI_SIGIO -5  
-#define SI_TKILL -6  
-#define SI_DETHREAD -7  
-
-#define SI_FROMUSER(siptr) ((siptr)->si_code <= 0)
-#define SI_FROMKERNEL(siptr) ((siptr)->si_code > 0)
-
-#define ILL_ILLOPC (__SI_FAULT|1)  
-#define ILL_ILLOPN (__SI_FAULT|2)  
-#define ILL_ILLADR (__SI_FAULT|3)  
-#define ILL_ILLTRP (__SI_FAULT|4)  
-#define ILL_PRVOPC (__SI_FAULT|5)  
-#define ILL_PRVREG (__SI_FAULT|6)  
-#define ILL_COPROC (__SI_FAULT|7)  
-#define ILL_BADSTK (__SI_FAULT|8)  
-#define NSIGILL 8
-
-#define FPE_INTDIV (__SI_FAULT|1)  
-#define FPE_INTOVF (__SI_FAULT|2)  
-#define FPE_FLTDIV (__SI_FAULT|3)  
-#define FPE_FLTOVF (__SI_FAULT|4)  
-#define FPE_FLTUND (__SI_FAULT|5)  
-#define FPE_FLTRES (__SI_FAULT|6)  
-#define FPE_FLTINV (__SI_FAULT|7)  
-#define FPE_FLTSUB (__SI_FAULT|8)  
-#define NSIGFPE 8
-
-#define SEGV_MAPERR (__SI_FAULT|1)  
-#define SEGV_ACCERR (__SI_FAULT|2)  
-#define NSIGSEGV 2
-
-#define BUS_ADRALN (__SI_FAULT|1)  
-#define BUS_ADRERR (__SI_FAULT|2)  
-#define BUS_OBJERR (__SI_FAULT|3)  
-#define NSIGBUS 3
-
-#define TRAP_BRKPT (__SI_FAULT|1)  
-#define TRAP_TRACE (__SI_FAULT|2)  
-#define NSIGTRAP 2
-
-#define CLD_EXITED (__SI_CHLD|1)  
-#define CLD_KILLED (__SI_CHLD|2)  
-#define CLD_DUMPED (__SI_CHLD|3)  
-#define CLD_TRAPPED (__SI_CHLD|4)  
-#define CLD_STOPPED (__SI_CHLD|5)  
-#define CLD_CONTINUED (__SI_CHLD|6)  
-#define NSIGCHLD 6
-
-#define POLL_IN (__SI_POLL|1)  
-#define POLL_OUT (__SI_POLL|2)  
-#define POLL_MSG (__SI_POLL|3)  
-#define POLL_ERR (__SI_POLL|4)  
-#define POLL_PRI (__SI_POLL|5)  
-#define POLL_HUP (__SI_POLL|6)  
-#define NSIGPOLL 6
-
-#define SIGEV_SIGNAL 0  
-#define SIGEV_NONE 1  
-#define SIGEV_THREAD 2  
-#define SIGEV_THREAD_ID 4  
-
-#ifndef __ARCH_SIGEV_PREAMBLE_SIZE
-#define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(int) * 2 + sizeof(sigval_t))
-#endif
-
-#define SIGEV_MAX_SIZE 64
-#define SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE - __ARCH_SIGEV_PREAMBLE_SIZE)   / sizeof(int))
-
-typedef struct sigevent {
- sigval_t sigev_value;
- int sigev_signo;
- int sigev_notify;
- union {
- int _pad[SIGEV_PAD_SIZE];
- int _tid;
-
- struct {
- void (*_function)(sigval_t);
- void *_attribute;
- } _sigev_thread;
- } _sigev_un;
-} sigevent_t;
-
-#define sigev_notify_function _sigev_un._sigev_thread._function
-#define sigev_notify_attributes _sigev_un._sigev_thread._attribute
-#define sigev_notify_thread_id _sigev_un._tid
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/signal.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/signal.h
deleted file mode 100644
index 226d99c..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/signal.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_GENERIC_SIGNAL_H
-#define __ASM_GENERIC_SIGNAL_H
-
-#include <linux/compiler.h>
-
-#ifndef SIG_BLOCK
-#define SIG_BLOCK 0  
-#endif
-#ifndef SIG_UNBLOCK
-#define SIG_UNBLOCK 1  
-#endif
-#ifndef SIG_SETMASK
-#define SIG_SETMASK 2  
-#endif
-
-#ifndef __ASSEMBLY__
-typedef void __signalfn_t(int);
-typedef __signalfn_t __user *__sighandler_t;
-
-typedef void __restorefn_t(void);
-typedef __restorefn_t __user *__sigrestore_t;
-
-#define SIG_DFL ((__force __sighandler_t)0)  
-#define SIG_IGN ((__force __sighandler_t)1)  
-#define SIG_ERR ((__force __sighandler_t)-1)  
-#endif
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/tlb.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/tlb.h
deleted file mode 100644
index dc1e79f..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/tlb.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC__TLB_H
-#define _ASM_GENERIC__TLB_H
-
-#include <linux/swap.h>
-#include <asm/pgalloc.h>
-#include <asm/tlbflush.h>
-
-#define FREE_PTE_NR 1
-#define tlb_fast_mode(tlb) 1
-
-struct mmu_gather {
- struct mm_struct *mm;
- unsigned int nr;
- unsigned int need_flush;
- unsigned int fullmm;
- struct page * pages[FREE_PTE_NR];
-};
-
-#define tlb_remove_tlb_entry(tlb, ptep, address)   do {   tlb->need_flush = 1;   __tlb_remove_tlb_entry(tlb, ptep, address);   } while (0)
-#define pte_free_tlb(tlb, ptep)   do {   tlb->need_flush = 1;   __pte_free_tlb(tlb, ptep);   } while (0)
-#ifndef __ARCH_HAS_4LEVEL_HACK
-#define pud_free_tlb(tlb, pudp)   do {   tlb->need_flush = 1;   __pud_free_tlb(tlb, pudp);   } while (0)
-#endif
-#define pmd_free_tlb(tlb, pmdp)   do {   tlb->need_flush = 1;   __pmd_free_tlb(tlb, pmdp);   } while (0)
-#define tlb_migrate_finish(mm) do {} while (0)
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/topology.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/topology.h
deleted file mode 100644
index 089b1f2..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/topology.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_TOPOLOGY_H
-#define _ASM_GENERIC_TOPOLOGY_H
-
-#ifndef cpu_to_node
-#define cpu_to_node(cpu) (0)
-#endif
-#ifndef parent_node
-#define parent_node(node) (0)
-#endif
-#ifndef node_to_cpumask
-#define node_to_cpumask(node) (cpu_online_map)
-#endif
-#ifndef node_to_first_cpu
-#define node_to_first_cpu(node) (0)
-#endif
-#ifndef pcibus_to_node
-#define pcibus_to_node(node) (-1)
-#endif
-
-#ifndef pcibus_to_cpumask
-#define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ?   CPU_MASK_ALL :   node_to_cpumask(pcibus_to_node(bus))   )
-#endif
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/xor.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/xor.h
deleted file mode 100644
index 6b1e4e8..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm-generic/xor.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#include <asm/processor.h>
-
-#define XOR_TRY_TEMPLATES   do {   xor_speed(&xor_block_8regs);   xor_speed(&xor_block_8regs_p);   xor_speed(&xor_block_32regs);   xor_speed(&xor_block_32regs_p);   } while (0)
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/a.out.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/a.out.h
deleted file mode 100644
index e8f17dc..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/a.out.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ARM_A_OUT_H__
-#define __ARM_A_OUT_H__
-
-#include <linux/personality.h>
-#include <asm/types.h>
-
-struct exec
-{
- __u32 a_info;
- __u32 a_text;
- __u32 a_data;
- __u32 a_bss;
- __u32 a_syms;
- __u32 a_entry;
- __u32 a_trsize;
- __u32 a_drsize;
-};
-
-#define N_TXTADDR(a) (0x00008000)
-
-#define N_TRSIZE(a) ((a).a_trsize)
-#define N_DRSIZE(a) ((a).a_drsize)
-#define N_SYMSIZE(a) ((a).a_syms)
-
-#define M_ARM 103
-
-#ifndef LIBRARY_START_TEXT
-#define LIBRARY_START_TEXT (0x00c00000)
-#endif
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/board-perseus2.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/board-perseus2.h
deleted file mode 100644
index c6c5413..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/board-perseus2.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARCH_OMAP_PERSEUS2_H
-#define __ASM_ARCH_OMAP_PERSEUS2_H
-
-#include <asm/arch/fpga.h>
-
-#ifndef OMAP_SDRAM_DEVICE
-#define OMAP_SDRAM_DEVICE D256M_1X16_4B
-#endif
-
-#define MAXIRQNUM IH_BOARD_BASE
-#define MAXFIQNUM MAXIRQNUM
-#define MAXSWINUM MAXIRQNUM
-
-#define NR_IRQS (MAXIRQNUM + 1)
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/board.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/board.h
deleted file mode 100644
index a7a4c66..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/board.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _OMAP_BOARD_H
-#define _OMAP_BOARD_H
-
-#include <linux/types.h>
-
-#include <asm/arch/gpio-switch.h>
-
-#define OMAP_TAG_CLOCK 0x4f01
-#define OMAP_TAG_MMC 0x4f02
-#define OMAP_TAG_SERIAL_CONSOLE 0x4f03
-#define OMAP_TAG_USB 0x4f04
-#define OMAP_TAG_LCD 0x4f05
-#define OMAP_TAG_GPIO_SWITCH 0x4f06
-#define OMAP_TAG_UART 0x4f07
-#define OMAP_TAG_FBMEM 0x4f08
-#define OMAP_TAG_STI_CONSOLE 0x4f09
-#define OMAP_TAG_CAMERA_SENSOR 0x4f0a
-#define OMAP_TAG_BT 0x4f0b
-
-#define OMAP_TAG_BOOT_REASON 0x4f80
-#define OMAP_TAG_FLASH_PART 0x4f81
-#define OMAP_TAG_VERSION_STR 0x4f82
-
-struct omap_clock_config {
-
- u8 system_clock_type;
-};
-
-struct omap_mmc_conf {
- unsigned enabled:1;
-
- unsigned nomux:1;
-
- unsigned cover:1;
-
- unsigned wire4:1;
- s16 power_pin;
- s16 switch_pin;
- s16 wp_pin;
-};
-
-struct omap_mmc_config {
- struct omap_mmc_conf mmc[2];
-};
-
-struct omap_serial_console_config {
- u8 console_uart;
- u32 console_speed;
-};
-
-struct omap_sti_console_config {
- unsigned enable:1;
- u8 channel;
-};
-
-struct omap_camera_sensor_config {
- u16 reset_gpio;
- int (*power_on)(void * data);
- int (*power_off)(void * data);
-};
-
-struct omap_usb_config {
-
- unsigned register_host:1;
- unsigned register_dev:1;
- u8 otg;
-
- u8 hmc_mode;
-
- u8 rwc;
-
- u8 pins[3];
-};
-
-struct omap_lcd_config {
- char panel_name[16];
- char ctrl_name[16];
- s16 nreset_gpio;
- u8 data_lines;
-};
-
-struct device;
-struct fb_info;
-struct omap_backlight_config {
- int default_intensity;
- int (*set_power)(struct device *dev, int state);
- int (*check_fb)(struct fb_info *fb);
-};
-
-struct omap_fbmem_config {
- u32 start;
- u32 size;
-};
-
-struct omap_pwm_led_platform_data {
- const char *name;
- int intensity_timer;
- int blink_timer;
- void (*set_power)(struct omap_pwm_led_platform_data *self, int on_off);
-};
-
-struct omap_gpio_switch_config {
- char name[12];
- u16 gpio;
- int flags:4;
- int type:4;
- int key_code:24;
-};
-
-struct omap_uart_config {
-
- unsigned int enabled_uarts;
-};
-
-struct omap_flash_part_config {
- char part_table[0];
-};
-
-struct omap_boot_reason_config {
- char reason_str[12];
-};
-
-struct omap_version_config {
- char component[12];
- char version[12];
-};
-
-struct omap_board_config_entry {
- u16 tag;
- u16 len;
- u8 data[0];
-};
-
-struct omap_board_config_kernel {
- u16 tag;
- const void *data;
-};
-
-struct omap_bluetooth_config {
- u8 chip_type;
- u8 bt_uart;
- u8 bd_addr[6];
- u8 bt_sysclk;
- int bt_wakeup_gpio;
- int host_wakeup_gpio;
- int reset_gpio;
-};
-
-#define omap_get_config(tag, type)   ((const type *) __omap_get_config((tag), sizeof(type), 0))
-#define omap_get_nr_config(tag, type, nr)   ((const type *) __omap_get_config((tag), sizeof(type), (nr)))
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/cpu.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/cpu.h
deleted file mode 100644
index fa7a408..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/cpu.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARCH_OMAP_CPU_H
-#define __ASM_ARCH_OMAP_CPU_H
-
-#define omap2_cpu_rev() ((system_rev >> 8) & 0x0f)
-
-#undef MULTI_OMAP1
-#undef MULTI_OMAP2
-#undef OMAP_NAME
-
-#define GET_OMAP_CLASS (system_rev & 0xff)
-
-#define IS_OMAP_CLASS(class, id)  static inline int is_omap ##class (void)  {   return (GET_OMAP_CLASS == (id)) ? 1 : 0;  }
-
-#define GET_OMAP_SUBCLASS ((system_rev >> 20) & 0x0fff)
-
-#define IS_OMAP_SUBCLASS(subclass, id)  static inline int is_omap ##subclass (void)  {   return (GET_OMAP_SUBCLASS == (id)) ? 1 : 0;  }
-
-#define cpu_is_omap7xx() 0
-#define cpu_is_omap15xx() 0
-#define cpu_is_omap16xx() 0
-#define cpu_is_omap24xx() 0
-#define cpu_is_omap242x() 0
-#define cpu_is_omap243x() 0
-#ifdef MULTI_OMAP1
-#else
-#endif
-#define GET_OMAP_TYPE ((system_rev >> 16) & 0xffff)
-#define IS_OMAP_TYPE(type, id)  static inline int is_omap ##type (void)  {   return (GET_OMAP_TYPE == (id)) ? 1 : 0;  }
-#define cpu_is_omap310() 0
-#define cpu_is_omap730() 0
-#define cpu_is_omap1510() 0
-#define cpu_is_omap1610() 0
-#define cpu_is_omap5912() 0
-#define cpu_is_omap1611() 0
-#define cpu_is_omap1621() 0
-#define cpu_is_omap1710() 0
-#define cpu_is_omap2420() 0
-#define cpu_is_omap2422() 0
-#define cpu_is_omap2423() 0
-#define cpu_is_omap2430() 0
-#ifdef MULTI_OMAP1
-#else
-#endif
-#define cpu_class_is_omap1() (cpu_is_omap730() || cpu_is_omap15xx() ||   cpu_is_omap16xx())
-#define cpu_class_is_omap2() cpu_is_omap24xx()
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/dma.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/dma.h
deleted file mode 100644
index 5e5be76..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/dma.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARCH_DMA_H
-#define __ASM_ARCH_DMA_H
-
-#define OMAP_DMA_BASE (0xfffed800)
-#define OMAP_DMA_GCR (OMAP_DMA_BASE + 0x400)
-#define OMAP_DMA_GSCR (OMAP_DMA_BASE + 0x404)
-#define OMAP_DMA_GRST (OMAP_DMA_BASE + 0x408)
-#define OMAP_DMA_HW_ID (OMAP_DMA_BASE + 0x442)
-#define OMAP_DMA_PCH2_ID (OMAP_DMA_BASE + 0x444)
-#define OMAP_DMA_PCH0_ID (OMAP_DMA_BASE + 0x446)
-#define OMAP_DMA_PCH1_ID (OMAP_DMA_BASE + 0x448)
-#define OMAP_DMA_PCHG_ID (OMAP_DMA_BASE + 0x44a)
-#define OMAP_DMA_PCHD_ID (OMAP_DMA_BASE + 0x44c)
-#define OMAP_DMA_CAPS_0_U (OMAP_DMA_BASE + 0x44e)
-#define OMAP_DMA_CAPS_0_L (OMAP_DMA_BASE + 0x450)
-#define OMAP_DMA_CAPS_1_U (OMAP_DMA_BASE + 0x452)
-#define OMAP_DMA_CAPS_1_L (OMAP_DMA_BASE + 0x454)
-#define OMAP_DMA_CAPS_2 (OMAP_DMA_BASE + 0x456)
-#define OMAP_DMA_CAPS_3 (OMAP_DMA_BASE + 0x458)
-#define OMAP_DMA_CAPS_4 (OMAP_DMA_BASE + 0x45a)
-#define OMAP_DMA_PCH2_SR (OMAP_DMA_BASE + 0x460)
-#define OMAP_DMA_PCH0_SR (OMAP_DMA_BASE + 0x480)
-#define OMAP_DMA_PCH1_SR (OMAP_DMA_BASE + 0x482)
-#define OMAP_DMA_PCHD_SR (OMAP_DMA_BASE + 0x4c0)
-
-#define OMAP24XX_DMA_BASE (L4_24XX_BASE + 0x56000)
-#define OMAP_DMA4_REVISION (OMAP24XX_DMA_BASE + 0x00)
-#define OMAP_DMA4_GCR_REG (OMAP24XX_DMA_BASE + 0x78)
-#define OMAP_DMA4_IRQSTATUS_L0 (OMAP24XX_DMA_BASE + 0x08)
-#define OMAP_DMA4_IRQSTATUS_L1 (OMAP24XX_DMA_BASE + 0x0c)
-#define OMAP_DMA4_IRQSTATUS_L2 (OMAP24XX_DMA_BASE + 0x10)
-#define OMAP_DMA4_IRQSTATUS_L3 (OMAP24XX_DMA_BASE + 0x14)
-#define OMAP_DMA4_IRQENABLE_L0 (OMAP24XX_DMA_BASE + 0x18)
-#define OMAP_DMA4_IRQENABLE_L1 (OMAP24XX_DMA_BASE + 0x1c)
-#define OMAP_DMA4_IRQENABLE_L2 (OMAP24XX_DMA_BASE + 0x20)
-#define OMAP_DMA4_IRQENABLE_L3 (OMAP24XX_DMA_BASE + 0x24)
-#define OMAP_DMA4_SYSSTATUS (OMAP24XX_DMA_BASE + 0x28)
-#define OMAP_DMA4_CAPS_0 (OMAP24XX_DMA_BASE + 0x64)
-#define OMAP_DMA4_CAPS_2 (OMAP24XX_DMA_BASE + 0x6c)
-#define OMAP_DMA4_CAPS_3 (OMAP24XX_DMA_BASE + 0x70)
-#define OMAP_DMA4_CAPS_4 (OMAP24XX_DMA_BASE + 0x74)
-
-#define OMAP_LOGICAL_DMA_CH_COUNT 32  
-
-#define OMAP_DMA_CCR_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0x80)
-#define OMAP_DMA_CLNK_CTRL_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0x84)
-#define OMAP_DMA_CICR_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0x88)
-#define OMAP_DMA_CSR_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0x8c)
-#define OMAP_DMA_CSDP_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0x90)
-#define OMAP_DMA_CEN_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0x94)
-#define OMAP_DMA_CFN_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0x98)
-#define OMAP_DMA_CSEI_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xa4)
-#define OMAP_DMA_CSFI_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xa8)
-#define OMAP_DMA_CDEI_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xac)
-#define OMAP_DMA_CDFI_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xb0)
-#define OMAP_DMA_CSAC_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xb4)
-#define OMAP_DMA_CDAC_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xb8)
-
-#define OMAP1_DMA_CSSA_L_REG(n) __REG16(OMAP_DMA_BASE + 0x40 * (n) + 0x08)
-#define OMAP1_DMA_CSSA_U_REG(n) __REG16(OMAP_DMA_BASE + 0x40 * (n) + 0x0a)
-#define OMAP1_DMA_CDSA_L_REG(n) __REG16(OMAP_DMA_BASE + 0x40 * (n) + 0x0c)
-#define OMAP1_DMA_CDSA_U_REG(n) __REG16(OMAP_DMA_BASE + 0x40 * (n) + 0x0e)
-#define OMAP1_DMA_COLOR_L_REG(n) __REG16(OMAP_DMA_BASE + 0x40 * (n) + 0x20)
-#define OMAP1_DMA_CCR2_REG(n) __REG16(OMAP_DMA_BASE + 0x40 * (n) + 0x24)
-#define OMAP1_DMA_COLOR_U_REG(n) __REG16(OMAP_DMA_BASE + 0x40 * (n) + 0x22)
-#define OMAP1_DMA_LCH_CTRL_REG(n) __REG16(OMAP_DMA_BASE + 0x40 * (n) + 0x2a)
-
-#define OMAP2_DMA_CSSA_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0x9c)
-#define OMAP2_DMA_CDSA_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xa0)
-#define OMAP2_DMA_CCEN_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xbc)
-#define OMAP2_DMA_CCFN_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xc0)
-#define OMAP2_DMA_COLOR_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xc4)
-
-#define OMAP_DMA_NO_DEVICE 0
-#define OMAP_DMA_MCSI1_TX 1
-#define OMAP_DMA_MCSI1_RX 2
-#define OMAP_DMA_I2C_RX 3
-#define OMAP_DMA_I2C_TX 4
-#define OMAP_DMA_EXT_NDMA_REQ 5
-#define OMAP_DMA_EXT_NDMA_REQ2 6
-#define OMAP_DMA_UWIRE_TX 7
-#define OMAP_DMA_MCBSP1_TX 8
-#define OMAP_DMA_MCBSP1_RX 9
-#define OMAP_DMA_MCBSP3_TX 10
-#define OMAP_DMA_MCBSP3_RX 11
-#define OMAP_DMA_UART1_TX 12
-#define OMAP_DMA_UART1_RX 13
-#define OMAP_DMA_UART2_TX 14
-#define OMAP_DMA_UART2_RX 15
-#define OMAP_DMA_MCBSP2_TX 16
-#define OMAP_DMA_MCBSP2_RX 17
-#define OMAP_DMA_UART3_TX 18
-#define OMAP_DMA_UART3_RX 19
-#define OMAP_DMA_CAMERA_IF_RX 20
-#define OMAP_DMA_MMC_TX 21
-#define OMAP_DMA_MMC_RX 22
-#define OMAP_DMA_NAND 23
-#define OMAP_DMA_IRQ_LCD_LINE 24
-#define OMAP_DMA_MEMORY_STICK 25
-#define OMAP_DMA_USB_W2FC_RX0 26
-#define OMAP_DMA_USB_W2FC_RX1 27
-#define OMAP_DMA_USB_W2FC_RX2 28
-#define OMAP_DMA_USB_W2FC_TX0 29
-#define OMAP_DMA_USB_W2FC_TX1 30
-#define OMAP_DMA_USB_W2FC_TX2 31
-
-#define OMAP_DMA_CRYPTO_DES_IN 32
-#define OMAP_DMA_SPI_TX 33
-#define OMAP_DMA_SPI_RX 34
-#define OMAP_DMA_CRYPTO_HASH 35
-#define OMAP_DMA_CCP_ATTN 36
-#define OMAP_DMA_CCP_FIFO_NOT_EMPTY 37
-#define OMAP_DMA_CMT_APE_TX_CHAN_0 38
-#define OMAP_DMA_CMT_APE_RV_CHAN_0 39
-#define OMAP_DMA_CMT_APE_TX_CHAN_1 40
-#define OMAP_DMA_CMT_APE_RV_CHAN_1 41
-#define OMAP_DMA_CMT_APE_TX_CHAN_2 42
-#define OMAP_DMA_CMT_APE_RV_CHAN_2 43
-#define OMAP_DMA_CMT_APE_TX_CHAN_3 44
-#define OMAP_DMA_CMT_APE_RV_CHAN_3 45
-#define OMAP_DMA_CMT_APE_TX_CHAN_4 46
-#define OMAP_DMA_CMT_APE_RV_CHAN_4 47
-#define OMAP_DMA_CMT_APE_TX_CHAN_5 48
-#define OMAP_DMA_CMT_APE_RV_CHAN_5 49
-#define OMAP_DMA_CMT_APE_TX_CHAN_6 50
-#define OMAP_DMA_CMT_APE_RV_CHAN_6 51
-#define OMAP_DMA_CMT_APE_TX_CHAN_7 52
-#define OMAP_DMA_CMT_APE_RV_CHAN_7 53
-#define OMAP_DMA_MMC2_TX 54
-#define OMAP_DMA_MMC2_RX 55
-#define OMAP_DMA_CRYPTO_DES_OUT 56
-
-#define OMAP24XX_DMA_NO_DEVICE 0
-#define OMAP24XX_DMA_XTI_DMA 1  
-#define OMAP24XX_DMA_EXT_DMAREQ0 2  
-#define OMAP24XX_DMA_EXT_DMAREQ1 3  
-#define OMAP24XX_DMA_GPMC 4  
-#define OMAP24XX_DMA_GFX 5  
-#define OMAP24XX_DMA_DSS 6  
-#define OMAP24XX_DMA_VLYNQ_TX 7  
-#define OMAP24XX_DMA_CWT 8  
-#define OMAP24XX_DMA_AES_TX 9  
-#define OMAP24XX_DMA_AES_RX 10  
-#define OMAP24XX_DMA_DES_TX 11  
-#define OMAP24XX_DMA_DES_RX 12  
-#define OMAP24XX_DMA_SHA1MD5_RX 13  
-#define OMAP24XX_DMA_EXT_DMAREQ2 14  
-#define OMAP24XX_DMA_EXT_DMAREQ3 15  
-#define OMAP24XX_DMA_EXT_DMAREQ4 16  
-#define OMAP24XX_DMA_EAC_AC_RD 17  
-#define OMAP24XX_DMA_EAC_AC_WR 18  
-#define OMAP24XX_DMA_EAC_MD_UL_RD 19  
-#define OMAP24XX_DMA_EAC_MD_UL_WR 20  
-#define OMAP24XX_DMA_EAC_MD_DL_RD 21  
-#define OMAP24XX_DMA_EAC_MD_DL_WR 22  
-#define OMAP24XX_DMA_EAC_BT_UL_RD 23  
-#define OMAP24XX_DMA_EAC_BT_UL_WR 24  
-#define OMAP24XX_DMA_EAC_BT_DL_RD 25  
-#define OMAP24XX_DMA_EAC_BT_DL_WR 26  
-#define OMAP24XX_DMA_I2C1_TX 27  
-#define OMAP24XX_DMA_I2C1_RX 28  
-#define OMAP24XX_DMA_I2C2_TX 29  
-#define OMAP24XX_DMA_I2C2_RX 30  
-#define OMAP24XX_DMA_MCBSP1_TX 31  
-#define OMAP24XX_DMA_MCBSP1_RX 32  
-#define OMAP24XX_DMA_MCBSP2_TX 33  
-#define OMAP24XX_DMA_MCBSP2_RX 34  
-#define OMAP24XX_DMA_SPI1_TX0 35  
-#define OMAP24XX_DMA_SPI1_RX0 36  
-#define OMAP24XX_DMA_SPI1_TX1 37  
-#define OMAP24XX_DMA_SPI1_RX1 38  
-#define OMAP24XX_DMA_SPI1_TX2 39  
-#define OMAP24XX_DMA_SPI1_RX2 40  
-#define OMAP24XX_DMA_SPI1_TX3 41  
-#define OMAP24XX_DMA_SPI1_RX3 42  
-#define OMAP24XX_DMA_SPI2_TX0 43  
-#define OMAP24XX_DMA_SPI2_RX0 44  
-#define OMAP24XX_DMA_SPI2_TX1 45  
-#define OMAP24XX_DMA_SPI2_RX1 46  
-
-#define OMAP24XX_DMA_UART1_TX 49  
-#define OMAP24XX_DMA_UART1_RX 50  
-#define OMAP24XX_DMA_UART2_TX 51  
-#define OMAP24XX_DMA_UART2_RX 52  
-#define OMAP24XX_DMA_UART3_TX 53  
-#define OMAP24XX_DMA_UART3_RX 54  
-#define OMAP24XX_DMA_USB_W2FC_TX0 55  
-#define OMAP24XX_DMA_USB_W2FC_RX0 56  
-#define OMAP24XX_DMA_USB_W2FC_TX1 57  
-#define OMAP24XX_DMA_USB_W2FC_RX1 58  
-#define OMAP24XX_DMA_USB_W2FC_TX2 59  
-#define OMAP24XX_DMA_USB_W2FC_RX2 60  
-#define OMAP24XX_DMA_MMC1_TX 61  
-#define OMAP24XX_DMA_MMC1_RX 62  
-#define OMAP24XX_DMA_MS 63  
-#define OMAP24XX_DMA_EXT_DMAREQ5 64  
-
-#define OMAP1510_DMA_LCD_BASE (0xfffedb00)
-#define OMAP1510_DMA_LCD_CTRL (OMAP1510_DMA_LCD_BASE + 0x00)
-#define OMAP1510_DMA_LCD_TOP_F1_L (OMAP1510_DMA_LCD_BASE + 0x02)
-#define OMAP1510_DMA_LCD_TOP_F1_U (OMAP1510_DMA_LCD_BASE + 0x04)
-#define OMAP1510_DMA_LCD_BOT_F1_L (OMAP1510_DMA_LCD_BASE + 0x06)
-#define OMAP1510_DMA_LCD_BOT_F1_U (OMAP1510_DMA_LCD_BASE + 0x08)
-
-#define OMAP1610_DMA_LCD_BASE (0xfffee300)
-#define OMAP1610_DMA_LCD_CSDP (OMAP1610_DMA_LCD_BASE + 0xc0)
-#define OMAP1610_DMA_LCD_CCR (OMAP1610_DMA_LCD_BASE + 0xc2)
-#define OMAP1610_DMA_LCD_CTRL (OMAP1610_DMA_LCD_BASE + 0xc4)
-#define OMAP1610_DMA_LCD_TOP_B1_L (OMAP1610_DMA_LCD_BASE + 0xc8)
-#define OMAP1610_DMA_LCD_TOP_B1_U (OMAP1610_DMA_LCD_BASE + 0xca)
-#define OMAP1610_DMA_LCD_BOT_B1_L (OMAP1610_DMA_LCD_BASE + 0xcc)
-#define OMAP1610_DMA_LCD_BOT_B1_U (OMAP1610_DMA_LCD_BASE + 0xce)
-#define OMAP1610_DMA_LCD_TOP_B2_L (OMAP1610_DMA_LCD_BASE + 0xd0)
-#define OMAP1610_DMA_LCD_TOP_B2_U (OMAP1610_DMA_LCD_BASE + 0xd2)
-#define OMAP1610_DMA_LCD_BOT_B2_L (OMAP1610_DMA_LCD_BASE + 0xd4)
-#define OMAP1610_DMA_LCD_BOT_B2_U (OMAP1610_DMA_LCD_BASE + 0xd6)
-#define OMAP1610_DMA_LCD_SRC_EI_B1 (OMAP1610_DMA_LCD_BASE + 0xd8)
-#define OMAP1610_DMA_LCD_SRC_FI_B1_L (OMAP1610_DMA_LCD_BASE + 0xda)
-#define OMAP1610_DMA_LCD_SRC_EN_B1 (OMAP1610_DMA_LCD_BASE + 0xe0)
-#define OMAP1610_DMA_LCD_SRC_FN_B1 (OMAP1610_DMA_LCD_BASE + 0xe4)
-#define OMAP1610_DMA_LCD_LCH_CTRL (OMAP1610_DMA_LCD_BASE + 0xea)
-#define OMAP1610_DMA_LCD_SRC_FI_B1_U (OMAP1610_DMA_LCD_BASE + 0xf4)
-
-#define OMAP1_DMA_TOUT_IRQ (1 << 0)
-#define OMAP_DMA_DROP_IRQ (1 << 1)
-#define OMAP_DMA_HALF_IRQ (1 << 2)
-#define OMAP_DMA_FRAME_IRQ (1 << 3)
-#define OMAP_DMA_LAST_IRQ (1 << 4)
-#define OMAP_DMA_BLOCK_IRQ (1 << 5)
-#define OMAP1_DMA_SYNC_IRQ (1 << 6)
-#define OMAP2_DMA_PKT_IRQ (1 << 7)
-#define OMAP2_DMA_TRANS_ERR_IRQ (1 << 8)
-#define OMAP2_DMA_SECURE_ERR_IRQ (1 << 9)
-#define OMAP2_DMA_SUPERVISOR_ERR_IRQ (1 << 10)
-#define OMAP2_DMA_MISALIGNED_ERR_IRQ (1 << 11)
-
-#define OMAP_DMA_DATA_TYPE_S8 0x00
-#define OMAP_DMA_DATA_TYPE_S16 0x01
-#define OMAP_DMA_DATA_TYPE_S32 0x02
-
-#define OMAP_DMA_SYNC_ELEMENT 0x00
-#define OMAP_DMA_SYNC_FRAME 0x01
-#define OMAP_DMA_SYNC_BLOCK 0x02
-
-#define OMAP_DMA_PORT_EMIFF 0x00
-#define OMAP_DMA_PORT_EMIFS 0x01
-#define OMAP_DMA_PORT_OCP_T1 0x02
-#define OMAP_DMA_PORT_TIPB 0x03
-#define OMAP_DMA_PORT_OCP_T2 0x04
-#define OMAP_DMA_PORT_MPUI 0x05
-
-#define OMAP_DMA_AMODE_CONSTANT 0x00
-#define OMAP_DMA_AMODE_POST_INC 0x01
-#define OMAP_DMA_AMODE_SINGLE_IDX 0x02
-#define OMAP_DMA_AMODE_DOUBLE_IDX 0x03
-
-enum {
- OMAP_LCD_DMA_B1_TOP,
- OMAP_LCD_DMA_B1_BOTTOM,
- OMAP_LCD_DMA_B2_TOP,
- OMAP_LCD_DMA_B2_BOTTOM
-};
-
-enum omap_dma_burst_mode {
- OMAP_DMA_DATA_BURST_DIS = 0,
- OMAP_DMA_DATA_BURST_4,
- OMAP_DMA_DATA_BURST_8,
- OMAP_DMA_DATA_BURST_16,
-};
-
-enum omap_dma_color_mode {
- OMAP_DMA_COLOR_DIS = 0,
- OMAP_DMA_CONSTANT_FILL,
- OMAP_DMA_TRANSPARENT_COPY
-};
-
-enum omap_dma_write_mode {
- OMAP_DMA_WRITE_NON_POSTED = 0,
- OMAP_DMA_WRITE_POSTED,
- OMAP_DMA_WRITE_LAST_NON_POSTED
-};
-
-struct omap_dma_channel_params {
- int data_type;
- int elem_count;
- int frame_count;
-
- int src_port;
- int src_amode;
- unsigned long src_start;
- int src_ei;
- int src_fi;
-
- int dst_port;
- int dst_amode;
- unsigned long dst_start;
- int dst_ei;
- int dst_fi;
-
- int trigger;
- int sync_mode;
- int src_or_dst_synch;
-
- int ie;
-};
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/fpga.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/fpga.h
deleted file mode 100644
index a1b210d..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/fpga.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARCH_OMAP_FPGA_H
-#define __ASM_ARCH_OMAP_FPGA_H
-
-#define omap1510_fpga_init_irq() (0)
-
-#define fpga_read(reg) __raw_readb(reg)
-#define fpga_write(val, reg) __raw_writeb(val, reg)
-
-#define H2P2_DBG_FPGA_BASE 0xE8000000  
-#define H2P2_DBG_FPGA_SIZE SZ_4K  
-#define H2P2_DBG_FPGA_START 0x04000000  
-
-#define H2P2_DBG_FPGA_ETHR_START (H2P2_DBG_FPGA_START + 0x300)
-#define H2P2_DBG_FPGA_FPGA_REV (H2P2_DBG_FPGA_BASE + 0x10)  
-#define H2P2_DBG_FPGA_BOARD_REV (H2P2_DBG_FPGA_BASE + 0x12)  
-#define H2P2_DBG_FPGA_GPIO (H2P2_DBG_FPGA_BASE + 0x14)  
-#define H2P2_DBG_FPGA_LEDS (H2P2_DBG_FPGA_BASE + 0x16)  
-#define H2P2_DBG_FPGA_MISC_INPUTS (H2P2_DBG_FPGA_BASE + 0x18)  
-#define H2P2_DBG_FPGA_LAN_STATUS (H2P2_DBG_FPGA_BASE + 0x1A)  
-#define H2P2_DBG_FPGA_LAN_RESET (H2P2_DBG_FPGA_BASE + 0x1C)  
-
-struct h2p2_dbg_fpga {
-
- u16 smc91x[8];
-
- u16 fpga_rev;
- u16 board_rev;
- u16 gpio_outputs;
- u16 leds;
-
- u16 misc_inputs;
- u16 lan_status;
- u16 lan_reset;
- u16 reserved0;
-
- u16 ps2_data;
- u16 ps2_ctrl;
-
-};
-
-#define H2P2_DBG_FPGA_LED_GREEN (1 << 15)
-#define H2P2_DBG_FPGA_LED_AMBER (1 << 14)
-#define H2P2_DBG_FPGA_LED_RED (1 << 13)
-#define H2P2_DBG_FPGA_LED_BLUE (1 << 12)
-
-#define H2P2_DBG_FPGA_LOAD_METER (1 << 0) 
-#define H2P2_DBG_FPGA_LOAD_METER_SIZE 11
-#define H2P2_DBG_FPGA_LOAD_METER_MASK ((1 << H2P2_DBG_FPGA_LOAD_METER_SIZE) - 1)
-
-#define H2P2_DBG_FPGA_P2_LED_TIMER (1 << 0)
-#define H2P2_DBG_FPGA_P2_LED_IDLE (1 << 1)
-
-#define OMAP1510_FPGA_BASE 0xE8000000  
-#define OMAP1510_FPGA_SIZE SZ_4K
-#define OMAP1510_FPGA_START 0x08000000  
-
-#define OMAP1510_FPGA_REV_LOW (OMAP1510_FPGA_BASE + 0x0)
-#define OMAP1510_FPGA_REV_HIGH (OMAP1510_FPGA_BASE + 0x1)
-
-#define OMAP1510_FPGA_LCD_PANEL_CONTROL (OMAP1510_FPGA_BASE + 0x2)
-#define OMAP1510_FPGA_LED_DIGIT (OMAP1510_FPGA_BASE + 0x3)
-#define INNOVATOR_FPGA_HID_SPI (OMAP1510_FPGA_BASE + 0x4)
-#define OMAP1510_FPGA_POWER (OMAP1510_FPGA_BASE + 0x5)
-
-#define OMAP1510_FPGA_ISR_LO (OMAP1510_FPGA_BASE + 0x6)
-#define OMAP1510_FPGA_ISR_HI (OMAP1510_FPGA_BASE + 0x7)
-
-#define OMAP1510_FPGA_IMR_LO (OMAP1510_FPGA_BASE + 0x8)
-#define OMAP1510_FPGA_IMR_HI (OMAP1510_FPGA_BASE + 0x9)
-
-#define OMAP1510_FPGA_HOST_RESET (OMAP1510_FPGA_BASE + 0xa)
-#define OMAP1510_FPGA_RST (OMAP1510_FPGA_BASE + 0xb)
-
-#define OMAP1510_FPGA_AUDIO (OMAP1510_FPGA_BASE + 0xc)
-#define OMAP1510_FPGA_DIP (OMAP1510_FPGA_BASE + 0xe)
-#define OMAP1510_FPGA_FPGA_IO (OMAP1510_FPGA_BASE + 0xf)
-#define OMAP1510_FPGA_UART1 (OMAP1510_FPGA_BASE + 0x14)
-#define OMAP1510_FPGA_UART2 (OMAP1510_FPGA_BASE + 0x15)
-#define OMAP1510_FPGA_OMAP1510_STATUS (OMAP1510_FPGA_BASE + 0x16)
-#define OMAP1510_FPGA_BOARD_REV (OMAP1510_FPGA_BASE + 0x18)
-#define OMAP1510P1_PPT_DATA (OMAP1510_FPGA_BASE + 0x100)
-#define OMAP1510P1_PPT_STATUS (OMAP1510_FPGA_BASE + 0x101)
-#define OMAP1510P1_PPT_CONTROL (OMAP1510_FPGA_BASE + 0x102)
-
-#define OMAP1510_FPGA_TOUCHSCREEN (OMAP1510_FPGA_BASE + 0x204)
-
-#define INNOVATOR_FPGA_INFO (OMAP1510_FPGA_BASE + 0x205)
-#define INNOVATOR_FPGA_LCD_BRIGHT_LO (OMAP1510_FPGA_BASE + 0x206)
-#define INNOVATOR_FPGA_LCD_BRIGHT_HI (OMAP1510_FPGA_BASE + 0x207)
-#define INNOVATOR_FPGA_LED_GRN_LO (OMAP1510_FPGA_BASE + 0x208)
-#define INNOVATOR_FPGA_LED_GRN_HI (OMAP1510_FPGA_BASE + 0x209)
-#define INNOVATOR_FPGA_LED_RED_LO (OMAP1510_FPGA_BASE + 0x20a)
-#define INNOVATOR_FPGA_LED_RED_HI (OMAP1510_FPGA_BASE + 0x20b)
-#define INNOVATOR_FPGA_CAM_USB_CONTROL (OMAP1510_FPGA_BASE + 0x20c)
-#define INNOVATOR_FPGA_EXP_CONTROL (OMAP1510_FPGA_BASE + 0x20d)
-#define INNOVATOR_FPGA_ISR2 (OMAP1510_FPGA_BASE + 0x20e)
-#define INNOVATOR_FPGA_IMR2 (OMAP1510_FPGA_BASE + 0x210)
-
-#define OMAP1510_FPGA_ETHR_START (OMAP1510_FPGA_START + 0x300)
-
-#define OMAP1510_FPGA_RESET_VALUE 0x42
-
-#define OMAP1510_FPGA_PCR_IF_PD0 (1 << 7)
-#define OMAP1510_FPGA_PCR_COM2_EN (1 << 6)
-#define OMAP1510_FPGA_PCR_COM1_EN (1 << 5)
-#define OMAP1510_FPGA_PCR_EXP_PD0 (1 << 4)
-#define OMAP1510_FPGA_PCR_EXP_PD1 (1 << 3)
-#define OMAP1510_FPGA_PCR_48MHZ_CLK (1 << 2)
-#define OMAP1510_FPGA_PCR_4MHZ_CLK (1 << 1)
-#define OMAP1510_FPGA_PCR_RSRVD_BIT0 (1 << 0)
-
-#define OMAP1510_FPGA_HID_SCLK (1<<0)  
-#define OMAP1510_FPGA_HID_MOSI (1<<1)  
-#define OMAP1510_FPGA_HID_nSS (1<<2)  
-#define OMAP1510_FPGA_HID_nHSUS (1<<3)  
-#define OMAP1510_FPGA_HID_MISO (1<<4)  
-#define OMAP1510_FPGA_HID_ATN (1<<5)  
-#define OMAP1510_FPGA_HID_rsrvd (1<<6)
-#define OMAP1510_FPGA_HID_RESETn (1<<7)  
-
-#define OMAP1510_INT_FPGA (IH_GPIO_BASE + 13)
-
-#define OMAP1510_IH_FPGA_BASE IH_BOARD_BASE
-#define OMAP1510_INT_FPGA_ATN (OMAP1510_IH_FPGA_BASE + 0)
-#define OMAP1510_INT_FPGA_ACK (OMAP1510_IH_FPGA_BASE + 1)
-#define OMAP1510_INT_FPGA2 (OMAP1510_IH_FPGA_BASE + 2)
-#define OMAP1510_INT_FPGA3 (OMAP1510_IH_FPGA_BASE + 3)
-#define OMAP1510_INT_FPGA4 (OMAP1510_IH_FPGA_BASE + 4)
-#define OMAP1510_INT_FPGA5 (OMAP1510_IH_FPGA_BASE + 5)
-#define OMAP1510_INT_FPGA6 (OMAP1510_IH_FPGA_BASE + 6)
-#define OMAP1510_INT_FPGA7 (OMAP1510_IH_FPGA_BASE + 7)
-#define OMAP1510_INT_FPGA8 (OMAP1510_IH_FPGA_BASE + 8)
-#define OMAP1510_INT_FPGA9 (OMAP1510_IH_FPGA_BASE + 9)
-#define OMAP1510_INT_FPGA10 (OMAP1510_IH_FPGA_BASE + 10)
-#define OMAP1510_INT_FPGA11 (OMAP1510_IH_FPGA_BASE + 11)
-#define OMAP1510_INT_FPGA12 (OMAP1510_IH_FPGA_BASE + 12)
-#define OMAP1510_INT_ETHER (OMAP1510_IH_FPGA_BASE + 13)
-#define OMAP1510_INT_FPGAUART1 (OMAP1510_IH_FPGA_BASE + 14)
-#define OMAP1510_INT_FPGAUART2 (OMAP1510_IH_FPGA_BASE + 15)
-#define OMAP1510_INT_FPGA_TS (OMAP1510_IH_FPGA_BASE + 16)
-#define OMAP1510_INT_FPGA17 (OMAP1510_IH_FPGA_BASE + 17)
-#define OMAP1510_INT_FPGA_CAM (OMAP1510_IH_FPGA_BASE + 18)
-#define OMAP1510_INT_FPGA_RTC_A (OMAP1510_IH_FPGA_BASE + 19)
-#define OMAP1510_INT_FPGA_RTC_B (OMAP1510_IH_FPGA_BASE + 20)
-#define OMAP1510_INT_FPGA_CD (OMAP1510_IH_FPGA_BASE + 21)
-#define OMAP1510_INT_FPGA22 (OMAP1510_IH_FPGA_BASE + 22)
-#define OMAP1510_INT_FPGA23 (OMAP1510_IH_FPGA_BASE + 23)
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/gpio-switch.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/gpio-switch.h
deleted file mode 100644
index 20ea3f2..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/gpio-switch.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARCH_OMAP_GPIO_SWITCH_H
-#define __ASM_ARCH_OMAP_GPIO_SWITCH_H
-
-#include <linux/types.h>
-
-#define OMAP_GPIO_SWITCH_TYPE_COVER 0x0000
-#define OMAP_GPIO_SWITCH_TYPE_CONNECTION 0x0001
-#define OMAP_GPIO_SWITCH_TYPE_ACTIVITY 0x0002
-#define OMAP_GPIO_SWITCH_FLAG_INVERTED 0x0001
-#define OMAP_GPIO_SWITCH_FLAG_OUTPUT 0x0002
-
-struct omap_gpio_switch {
- const char *name;
- s16 gpio;
- unsigned flags:4;
- unsigned type:4;
-
- u16 debounce_rising;
-
- u16 debounce_falling;
-
- void (* notify)(void *data, int state);
- void *notify_data;
-};
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/gpio.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/gpio.h
deleted file mode 100644
index 332246d..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/gpio.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARCH_OMAP_GPIO_H
-#define __ASM_ARCH_OMAP_GPIO_H
-
-#include <asm/hardware.h>
-#include <asm/arch/irqs.h>
-#include <asm/io.h>
-
-#define OMAP_MPUIO_BASE (void __iomem *)0xfffb5000
-
-#define OMAP_MPUIO_INPUT_LATCH 0x00
-#define OMAP_MPUIO_OUTPUT 0x04
-#define OMAP_MPUIO_IO_CNTL 0x08
-#define OMAP_MPUIO_KBR_LATCH 0x10
-#define OMAP_MPUIO_KBC 0x14
-#define OMAP_MPUIO_GPIO_EVENT_MODE 0x18
-#define OMAP_MPUIO_GPIO_INT_EDGE 0x1c
-#define OMAP_MPUIO_KBD_INT 0x20
-#define OMAP_MPUIO_GPIO_INT 0x24
-#define OMAP_MPUIO_KBD_MASKIT 0x28
-#define OMAP_MPUIO_GPIO_MASKIT 0x2c
-#define OMAP_MPUIO_GPIO_DEBOUNCING 0x30
-#define OMAP_MPUIO_LATCH 0x34
-
-#define OMAP_MPUIO(nr) (OMAP_MAX_GPIO_LINES + (nr))
-#define OMAP_GPIO_IS_MPUIO(nr) ((nr) >= OMAP_MAX_GPIO_LINES)
-
-#define OMAP_GPIO_IRQ(nr) (OMAP_GPIO_IS_MPUIO(nr) ?   IH_MPUIO_BASE + ((nr) & 0x0f) :   IH_GPIO_BASE + (nr))
-
-struct omap_machine_gpio_bank {
- int start;
- int end;
-
- void (*set_gpio_direction)(int gpio, int is_input);
- void (*set_gpio_dataout)(int gpio, int enable);
- int (*get_gpio_datain)(int gpio);
-};
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/hardware.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/hardware.h
deleted file mode 100644
index e515ee8..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/hardware.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARCH_OMAP_HARDWARE_H
-#define __ASM_ARCH_OMAP_HARDWARE_H
-
-#include <asm/sizes.h>
-#ifndef __ASSEMBLER__
-#include <asm/types.h>
-#include <asm/arch/cpu.h>
-#endif
-#include <asm/arch/io.h>
-#include <asm/arch/serial.h>
-
-#define OMAP_MPU_TIMER1_BASE (0xfffec500)
-#define OMAP_MPU_TIMER2_BASE (0xfffec600)
-#define OMAP_MPU_TIMER3_BASE (0xfffec700)
-#define MPU_TIMER_FREE (1 << 6)
-#define MPU_TIMER_CLOCK_ENABLE (1 << 5)
-#define MPU_TIMER_AR (1 << 1)
-#define MPU_TIMER_ST (1 << 0)
-
-#define CLKGEN_REG_BASE (0xfffece00)
-#define ARM_CKCTL (CLKGEN_REG_BASE + 0x0)
-#define ARM_IDLECT1 (CLKGEN_REG_BASE + 0x4)
-#define ARM_IDLECT2 (CLKGEN_REG_BASE + 0x8)
-#define ARM_EWUPCT (CLKGEN_REG_BASE + 0xC)
-#define ARM_RSTCT1 (CLKGEN_REG_BASE + 0x10)
-#define ARM_RSTCT2 (CLKGEN_REG_BASE + 0x14)
-#define ARM_SYSST (CLKGEN_REG_BASE + 0x18)
-#define ARM_IDLECT3 (CLKGEN_REG_BASE + 0x24)
-
-#define CK_RATEF 1
-#define CK_IDLEF 2
-#define CK_ENABLEF 4
-#define CK_SELECTF 8
-#define SETARM_IDLE_SHIFT
-
-#define DPLL_CTL (0xfffecf00)
-
-#define DSP_CONFIG_REG_BASE (0xe1008000)
-#define DSP_CKCTL (DSP_CONFIG_REG_BASE + 0x0)
-#define DSP_IDLECT1 (DSP_CONFIG_REG_BASE + 0x4)
-#define DSP_IDLECT2 (DSP_CONFIG_REG_BASE + 0x8)
-#define DSP_RSTCT2 (DSP_CONFIG_REG_BASE + 0x14)
-
-#define ULPD_REG_BASE (0xfffe0800)
-#define ULPD_IT_STATUS (ULPD_REG_BASE + 0x14)
-#define ULPD_SETUP_ANALOG_CELL_3 (ULPD_REG_BASE + 0x24)
-#define ULPD_CLOCK_CTRL (ULPD_REG_BASE + 0x30)
-#define DIS_USB_PVCI_CLK (1 << 5)  
-#define USB_MCLK_EN (1 << 4)  
-#define ULPD_SOFT_REQ (ULPD_REG_BASE + 0x34)
-#define SOFT_UDC_REQ (1 << 4)
-#define SOFT_USB_CLK_REQ (1 << 3)
-#define SOFT_DPLL_REQ (1 << 0)
-#define ULPD_DPLL_CTRL (ULPD_REG_BASE + 0x3c)
-#define ULPD_STATUS_REQ (ULPD_REG_BASE + 0x40)
-#define ULPD_APLL_CTRL (ULPD_REG_BASE + 0x4c)
-#define ULPD_POWER_CTRL (ULPD_REG_BASE + 0x50)
-#define ULPD_SOFT_DISABLE_REQ_REG (ULPD_REG_BASE + 0x68)
-#define DIS_MMC2_DPLL_REQ (1 << 11)
-#define DIS_MMC1_DPLL_REQ (1 << 10)
-#define DIS_UART3_DPLL_REQ (1 << 9)
-#define DIS_UART2_DPLL_REQ (1 << 8)
-#define DIS_UART1_DPLL_REQ (1 << 7)
-#define DIS_USB_HOST_DPLL_REQ (1 << 6)
-#define ULPD_SDW_CLK_DIV_CTRL_SEL (ULPD_REG_BASE + 0x74)
-#define ULPD_CAM_CLK_CTRL (ULPD_REG_BASE + 0x7c)
-
-#define OMAP_MPU_WATCHDOG_BASE (0xfffec800)
-#define OMAP_WDT_TIMER (OMAP_MPU_WATCHDOG_BASE + 0x0)
-#define OMAP_WDT_LOAD_TIM (OMAP_MPU_WATCHDOG_BASE + 0x4)
-#define OMAP_WDT_READ_TIM (OMAP_MPU_WATCHDOG_BASE + 0x4)
-#define OMAP_WDT_TIMER_MODE (OMAP_MPU_WATCHDOG_BASE + 0x8)
-
-#define MOD_CONF_CTRL_0 0xfffe1080
-#define MOD_CONF_CTRL_1 0xfffe1110
-
-#define FUNC_MUX_CTRL_0 0xfffe1000
-#define FUNC_MUX_CTRL_1 0xfffe1004
-#define FUNC_MUX_CTRL_2 0xfffe1008
-#define COMP_MODE_CTRL_0 0xfffe100c
-#define FUNC_MUX_CTRL_3 0xfffe1010
-#define FUNC_MUX_CTRL_4 0xfffe1014
-#define FUNC_MUX_CTRL_5 0xfffe1018
-#define FUNC_MUX_CTRL_6 0xfffe101C
-#define FUNC_MUX_CTRL_7 0xfffe1020
-#define FUNC_MUX_CTRL_8 0xfffe1024
-#define FUNC_MUX_CTRL_9 0xfffe1028
-#define FUNC_MUX_CTRL_A 0xfffe102C
-#define FUNC_MUX_CTRL_B 0xfffe1030
-#define FUNC_MUX_CTRL_C 0xfffe1034
-#define FUNC_MUX_CTRL_D 0xfffe1038
-#define PULL_DWN_CTRL_0 0xfffe1040
-#define PULL_DWN_CTRL_1 0xfffe1044
-#define PULL_DWN_CTRL_2 0xfffe1048
-#define PULL_DWN_CTRL_3 0xfffe104c
-#define PULL_DWN_CTRL_4 0xfffe10ac
-
-#define FUNC_MUX_CTRL_E 0xfffe1090
-#define FUNC_MUX_CTRL_F 0xfffe1094
-#define FUNC_MUX_CTRL_10 0xfffe1098
-#define FUNC_MUX_CTRL_11 0xfffe109c
-#define FUNC_MUX_CTRL_12 0xfffe10a0
-#define PU_PD_SEL_0 0xfffe10b4
-#define PU_PD_SEL_1 0xfffe10b8
-#define PU_PD_SEL_2 0xfffe10bc
-#define PU_PD_SEL_3 0xfffe10c0
-#define PU_PD_SEL_4 0xfffe10c4
-
-#define OMAP_TIMER32K_BASE 0xFFFBC400
-
-#define TIPB_PUBLIC_CNTL_BASE 0xfffed300
-#define MPU_PUBLIC_TIPB_CNTL (TIPB_PUBLIC_CNTL_BASE + 0x8)
-#define TIPB_PRIVATE_CNTL_BASE 0xfffeca00
-#define MPU_PRIVATE_TIPB_CNTL (TIPB_PRIVATE_CNTL_BASE + 0x8)
-
-#define MPUI_BASE (0xfffec900)
-#define MPUI_CTRL (MPUI_BASE + 0x0)
-#define MPUI_DEBUG_ADDR (MPUI_BASE + 0x4)
-#define MPUI_DEBUG_DATA (MPUI_BASE + 0x8)
-#define MPUI_DEBUG_FLAG (MPUI_BASE + 0xc)
-#define MPUI_STATUS_REG (MPUI_BASE + 0x10)
-#define MPUI_DSP_STATUS (MPUI_BASE + 0x14)
-#define MPUI_DSP_BOOT_CONFIG (MPUI_BASE + 0x18)
-#define MPUI_DSP_API_CONFIG (MPUI_BASE + 0x1c)
-
-#define OMAP_LPG1_BASE 0xfffbd000
-#define OMAP_LPG2_BASE 0xfffbd800
-#define OMAP_LPG1_LCR (OMAP_LPG1_BASE + 0x00)
-#define OMAP_LPG1_PMR (OMAP_LPG1_BASE + 0x04)
-#define OMAP_LPG2_LCR (OMAP_LPG2_BASE + 0x00)
-#define OMAP_LPG2_PMR (OMAP_LPG2_BASE + 0x04)
-
-#define OMAP_PWL_BASE 0xfffb5800
-#define OMAP_PWL_ENABLE (OMAP_PWL_BASE + 0x00)
-#define OMAP_PWL_CLK_ENABLE (OMAP_PWL_BASE + 0x04)
-
-#include "omap730.h"
-#include "omap1510.h"
-#include "omap24xx.h"
-#include "omap16xx.h"
-
-#ifndef __ASSEMBLER__
-
-#endif
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/io.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/io.h
deleted file mode 100644
index 12ac3d4..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/io.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARM_ARCH_IO_H
-#define __ASM_ARM_ARCH_IO_H
-
-#include <asm/hardware.h>
-
-#define IO_SPACE_LIMIT 0xffffffff
-
-#define __io(a) ((void __iomem *)(PCIO_BASE + (a)))
-#define __mem_pci(a) (a)
-
-#define PCIO_BASE 0
-
-#ifndef __ASSEMBLER__
-
-#define omap_readb(a) (*(volatile unsigned char *)IO_ADDRESS(a))
-#define omap_readw(a) (*(volatile unsigned short *)IO_ADDRESS(a))
-#define omap_readl(a) (*(volatile unsigned int *)IO_ADDRESS(a))
-
-#define omap_writeb(v,a) (*(volatile unsigned char *)IO_ADDRESS(a) = (v))
-#define omap_writew(v,a) (*(volatile unsigned short *)IO_ADDRESS(a) = (v))
-#define omap_writel(v,a) (*(volatile unsigned int *)IO_ADDRESS(a) = (v))
-
-typedef struct { volatile u16 offset[256]; } __regbase16;
-#define __REGV16(vaddr) ((__regbase16 *)((vaddr)&~0xff))   ->offset[((vaddr)&0xff)>>1]
-#define __REG16(paddr) __REGV16(io_p2v(paddr))
-
-typedef struct { volatile u8 offset[4096]; } __regbase8;
-#define __REGV8(vaddr) ((__regbase8 *)((vaddr)&~4095))   ->offset[((vaddr)&4095)>>0]
-#define __REG8(paddr) __REGV8(io_p2v(paddr))
-
-typedef struct { volatile u32 offset[4096]; } __regbase32;
-#define __REGV32(vaddr) ((__regbase32 *)((vaddr)&~4095))   ->offset[((vaddr)&4095)>>2]
-#define __REG32(paddr) __REGV32(io_p2v(paddr))
-
-#else
-
-#define __REG8(paddr) io_p2v(paddr)
-#define __REG16(paddr) io_p2v(paddr)
-#define __REG32(paddr) io_p2v(paddr)
-
-#endif
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/irqs.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/irqs.h
deleted file mode 100644
index 3e94487..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/irqs.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARCH_OMAP15XX_IRQS_H
-#define __ASM_ARCH_OMAP15XX_IRQS_H
-
-#define INT_CAMERA 1
-#define INT_FIQ 3
-#define INT_RTDX 6
-#define INT_DSP_MMU_ABORT 7
-#define INT_HOST 8
-#define INT_ABORT 9
-#define INT_DSP_MAILBOX1 10
-#define INT_DSP_MAILBOX2 11
-#define INT_BRIDGE_PRIV 13
-#define INT_GPIO_BANK1 14
-#define INT_UART3 15
-#define INT_TIMER3 16
-#define INT_DMA_CH0_6 19
-#define INT_DMA_CH1_7 20
-#define INT_DMA_CH2_8 21
-#define INT_DMA_CH3 22
-#define INT_DMA_CH4 23
-#define INT_DMA_CH5 24
-#define INT_DMA_LCD 25
-#define INT_TIMER1 26
-#define INT_WD_TIMER 27
-#define INT_BRIDGE_PUB 28
-#define INT_TIMER2 30
-#define INT_LCD_CTRL 31
-
-#define INT_1510_IH2_IRQ 0
-#define INT_1510_RES2 2
-#define INT_1510_SPI_TX 4
-#define INT_1510_SPI_RX 5
-#define INT_1510_RES12 12
-#define INT_1510_LB_MMU 17
-#define INT_1510_RES18 18
-#define INT_1510_LOCAL_BUS 29
-
-#define INT_1610_IH2_IRQ 0
-#define INT_1610_IH2_FIQ 2
-#define INT_1610_McBSP2_TX 4
-#define INT_1610_McBSP2_RX 5
-#define INT_1610_LCD_LINE 12
-#define INT_1610_GPTIMER1 17
-#define INT_1610_GPTIMER2 18
-#define INT_1610_SSR_FIFO_0 29
-
-#define INT_730_IH2_FIQ 0
-#define INT_730_IH2_IRQ 1
-#define INT_730_USB_NON_ISO 2
-#define INT_730_USB_ISO 3
-#define INT_730_ICR 4
-#define INT_730_EAC 5
-#define INT_730_GPIO_BANK1 6
-#define INT_730_GPIO_BANK2 7
-#define INT_730_GPIO_BANK3 8
-#define INT_730_McBSP2TX 10
-#define INT_730_McBSP2RX 11
-#define INT_730_McBSP2RX_OVF 12
-#define INT_730_LCD_LINE 14
-#define INT_730_GSM_PROTECT 15
-#define INT_730_TIMER3 16
-#define INT_730_GPIO_BANK5 17
-#define INT_730_GPIO_BANK6 18
-#define INT_730_SPGIO_WR 29
-
-#define IH2_BASE 32
-
-#define INT_KEYBOARD (1 + IH2_BASE)
-#define INT_uWireTX (2 + IH2_BASE)
-#define INT_uWireRX (3 + IH2_BASE)
-#define INT_I2C (4 + IH2_BASE)
-#define INT_MPUIO (5 + IH2_BASE)
-#define INT_USB_HHC_1 (6 + IH2_BASE)
-#define INT_McBSP3TX (10 + IH2_BASE)
-#define INT_McBSP3RX (11 + IH2_BASE)
-#define INT_McBSP1TX (12 + IH2_BASE)
-#define INT_McBSP1RX (13 + IH2_BASE)
-#define INT_UART2 (14 + IH2_BASE)
-#define INT_UART1 (15 + IH2_BASE)
-#define INT_BT_MCSI1TX (16 + IH2_BASE)
-#define INT_BT_MCSI1RX (17 + IH2_BASE)
-#define INT_USB_W2FC (20 + IH2_BASE)
-#define INT_1WIRE (21 + IH2_BASE)
-#define INT_OS_TIMER (22 + IH2_BASE)
-#define INT_MMC (23 + IH2_BASE)
-#define INT_GAUGE_32K (24 + IH2_BASE)
-#define INT_RTC_TIMER (25 + IH2_BASE)
-#define INT_RTC_ALARM (26 + IH2_BASE)
-#define INT_MEM_STICK (27 + IH2_BASE)
-#define INT_DSP_MMU (28 + IH2_BASE)
-
-#define INT_1510_COM_SPI_RO (31 + IH2_BASE)
-
-#define INT_1610_FAC (0 + IH2_BASE)
-#define INT_1610_USB_HHC_2 (7 + IH2_BASE)
-#define INT_1610_USB_OTG (8 + IH2_BASE)
-#define INT_1610_SoSSI (9 + IH2_BASE)
-#define INT_1610_SoSSI_MATCH (19 + IH2_BASE)
-#define INT_1610_McBSP2RX_OF (31 + IH2_BASE)
-#define INT_1610_STI (32 + IH2_BASE)
-#define INT_1610_STI_WAKEUP (33 + IH2_BASE)
-#define INT_1610_GPTIMER3 (34 + IH2_BASE)
-#define INT_1610_GPTIMER4 (35 + IH2_BASE)
-#define INT_1610_GPTIMER5 (36 + IH2_BASE)
-#define INT_1610_GPTIMER6 (37 + IH2_BASE)
-#define INT_1610_GPTIMER7 (38 + IH2_BASE)
-#define INT_1610_GPTIMER8 (39 + IH2_BASE)
-#define INT_1610_GPIO_BANK2 (40 + IH2_BASE)
-#define INT_1610_GPIO_BANK3 (41 + IH2_BASE)
-#define INT_1610_MMC2 (42 + IH2_BASE)
-#define INT_1610_CF (43 + IH2_BASE)
-#define INT_1610_WAKE_UP_REQ (46 + IH2_BASE)
-#define INT_1610_GPIO_BANK4 (48 + IH2_BASE)
-#define INT_1610_SPI (49 + IH2_BASE)
-#define INT_1610_DMA_CH6 (53 + IH2_BASE)
-#define INT_1610_DMA_CH7 (54 + IH2_BASE)
-#define INT_1610_DMA_CH8 (55 + IH2_BASE)
-#define INT_1610_DMA_CH9 (56 + IH2_BASE)
-#define INT_1610_DMA_CH10 (57 + IH2_BASE)
-#define INT_1610_DMA_CH11 (58 + IH2_BASE)
-#define INT_1610_DMA_CH12 (59 + IH2_BASE)
-#define INT_1610_DMA_CH13 (60 + IH2_BASE)
-#define INT_1610_DMA_CH14 (61 + IH2_BASE)
-#define INT_1610_DMA_CH15 (62 + IH2_BASE)
-#define INT_1610_NAND (63 + IH2_BASE)
-
-#define INT_730_HW_ERRORS (0 + IH2_BASE)
-#define INT_730_NFIQ_PWR_FAIL (1 + IH2_BASE)
-#define INT_730_CFCD (2 + IH2_BASE)
-#define INT_730_CFIREQ (3 + IH2_BASE)
-#define INT_730_I2C (4 + IH2_BASE)
-#define INT_730_PCC (5 + IH2_BASE)
-#define INT_730_MPU_EXT_NIRQ (6 + IH2_BASE)
-#define INT_730_SPI_100K_1 (7 + IH2_BASE)
-#define INT_730_SYREN_SPI (8 + IH2_BASE)
-#define INT_730_VLYNQ (9 + IH2_BASE)
-#define INT_730_GPIO_BANK4 (10 + IH2_BASE)
-#define INT_730_McBSP1TX (11 + IH2_BASE)
-#define INT_730_McBSP1RX (12 + IH2_BASE)
-#define INT_730_McBSP1RX_OF (13 + IH2_BASE)
-#define INT_730_UART_MODEM_IRDA_2 (14 + IH2_BASE)
-#define INT_730_UART_MODEM_1 (15 + IH2_BASE)
-#define INT_730_MCSI (16 + IH2_BASE)
-#define INT_730_uWireTX (17 + IH2_BASE)
-#define INT_730_uWireRX (18 + IH2_BASE)
-#define INT_730_SMC_CD (19 + IH2_BASE)
-#define INT_730_SMC_IREQ (20 + IH2_BASE)
-#define INT_730_HDQ_1WIRE (21 + IH2_BASE)
-#define INT_730_TIMER32K (22 + IH2_BASE)
-#define INT_730_MMC_SDIO (23 + IH2_BASE)
-#define INT_730_UPLD (24 + IH2_BASE)
-#define INT_730_USB_HHC_1 (27 + IH2_BASE)
-#define INT_730_USB_HHC_2 (28 + IH2_BASE)
-#define INT_730_USB_GENI (29 + IH2_BASE)
-#define INT_730_USB_OTG (30 + IH2_BASE)
-#define INT_730_CAMERA_IF (31 + IH2_BASE)
-#define INT_730_RNG (32 + IH2_BASE)
-#define INT_730_DUAL_MODE_TIMER (33 + IH2_BASE)
-#define INT_730_DBB_RF_EN (34 + IH2_BASE)
-#define INT_730_MPUIO_KEYPAD (35 + IH2_BASE)
-#define INT_730_SHA1_MD5 (36 + IH2_BASE)
-#define INT_730_SPI_100K_2 (37 + IH2_BASE)
-#define INT_730_RNG_IDLE (38 + IH2_BASE)
-#define INT_730_MPUIO (39 + IH2_BASE)
-#define INT_730_LLPC_LCD_CTRL_CAN_BE_OFF (40 + IH2_BASE)
-#define INT_730_LLPC_OE_FALLING (41 + IH2_BASE)
-#define INT_730_LLPC_OE_RISING (42 + IH2_BASE)
-#define INT_730_LLPC_VSYNC (43 + IH2_BASE)
-#define INT_730_WAKE_UP_REQ (46 + IH2_BASE)
-#define INT_730_DMA_CH6 (53 + IH2_BASE)
-#define INT_730_DMA_CH7 (54 + IH2_BASE)
-#define INT_730_DMA_CH8 (55 + IH2_BASE)
-#define INT_730_DMA_CH9 (56 + IH2_BASE)
-#define INT_730_DMA_CH10 (57 + IH2_BASE)
-#define INT_730_DMA_CH11 (58 + IH2_BASE)
-#define INT_730_DMA_CH12 (59 + IH2_BASE)
-#define INT_730_DMA_CH13 (60 + IH2_BASE)
-#define INT_730_DMA_CH14 (61 + IH2_BASE)
-#define INT_730_DMA_CH15 (62 + IH2_BASE)
-#define INT_730_NAND (63 + IH2_BASE)
-
-#define INT_24XX_SYS_NIRQ 7
-#define INT_24XX_SDMA_IRQ0 12
-#define INT_24XX_SDMA_IRQ1 13
-#define INT_24XX_SDMA_IRQ2 14
-#define INT_24XX_SDMA_IRQ3 15
-#define INT_24XX_CAM_IRQ 24
-#define INT_24XX_DSS_IRQ 25
-#define INT_24XX_GPIO_BANK1 29
-#define INT_24XX_GPIO_BANK2 30
-#define INT_24XX_GPIO_BANK3 31
-#define INT_24XX_GPIO_BANK4 32
-#define INT_24XX_GPTIMER1 37
-#define INT_24XX_GPTIMER2 38
-#define INT_24XX_GPTIMER3 39
-#define INT_24XX_GPTIMER4 40
-#define INT_24XX_GPTIMER5 41
-#define INT_24XX_GPTIMER6 42
-#define INT_24XX_GPTIMER7 43
-#define INT_24XX_GPTIMER8 44
-#define INT_24XX_GPTIMER9 45
-#define INT_24XX_GPTIMER10 46
-#define INT_24XX_GPTIMER11 47
-#define INT_24XX_GPTIMER12 48
-#define INT_24XX_MCBSP1_IRQ_TX 59
-#define INT_24XX_MCBSP1_IRQ_RX 60
-#define INT_24XX_MCBSP2_IRQ_TX 62
-#define INT_24XX_MCBSP2_IRQ_RX 63
-#define INT_24XX_UART1_IRQ 72
-#define INT_24XX_UART2_IRQ 73
-#define INT_24XX_UART3_IRQ 74
-#define INT_24XX_MMC_IRQ 83
-
-#define OMAP_MAX_GPIO_LINES 192
-#define IH_GPIO_BASE (128 + IH2_BASE)
-#define IH_MPUIO_BASE (OMAP_MAX_GPIO_LINES + IH_GPIO_BASE)
-#define IH_BOARD_BASE (16 + IH_MPUIO_BASE)
-
-#define OMAP_IRQ_BIT(irq) (1 << ((irq) % 32))
-
-#ifndef __ASSEMBLY__
-
-#endif
-
-#include <asm/hardware.h>
-
-#ifndef NR_IRQS
-#define NR_IRQS IH_BOARD_BASE
-#endif
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/mcbsp.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/mcbsp.h
deleted file mode 100644
index cae5e3b..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/mcbsp.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARCH_OMAP_MCBSP_H
-#define __ASM_ARCH_OMAP_MCBSP_H
-
-#include <asm/hardware.h>
-
-#define OMAP730_MCBSP1_BASE 0xfffb1000
-#define OMAP730_MCBSP2_BASE 0xfffb1800
-
-#define OMAP1510_MCBSP1_BASE 0xe1011800
-#define OMAP1510_MCBSP2_BASE 0xfffb1000
-#define OMAP1510_MCBSP3_BASE 0xe1017000
-
-#define OMAP1610_MCBSP1_BASE 0xe1011800
-#define OMAP1610_MCBSP2_BASE 0xfffb1000
-#define OMAP1610_MCBSP3_BASE 0xe1017000
-
-#define OMAP24XX_MCBSP1_BASE 0x48074000
-#define OMAP24XX_MCBSP2_BASE 0x48076000
-
-#define OMAP_MCBSP_READ(base, reg) __raw_readw((base) + OMAP_MCBSP_REG_##reg)
-#define OMAP_MCBSP_WRITE(base, reg, val) __raw_writew((val), (base) + OMAP_MCBSP_REG_##reg)
-
-#define RRST 0x0001
-#define RRDY 0x0002
-#define RFULL 0x0004
-#define RSYNC_ERR 0x0008
-#define RINTM(value) ((value)<<4)  
-#define ABIS 0x0040
-#define DXENA 0x0080
-#define CLKSTP(value) ((value)<<11)  
-#define RJUST(value) ((value)<<13)  
-#define DLB 0x8000
-
-#define XRST 0x0001
-#define XRDY 0x0002
-#define XEMPTY 0x0004
-#define XSYNC_ERR 0x0008
-#define XINTM(value) ((value)<<4)  
-#define GRST 0x0040
-#define FRST 0x0080
-#define SOFT 0x0100
-#define FREE 0x0200
-
-#define CLKRP 0x0001
-#define CLKXP 0x0002
-#define FSRP 0x0004
-#define FSXP 0x0008
-#define DR_STAT 0x0010
-#define DX_STAT 0x0020
-#define CLKS_STAT 0x0040
-#define SCLKME 0x0080
-#define CLKRM 0x0100
-#define CLKXM 0x0200
-#define FSRM 0x0400
-#define FSXM 0x0800
-#define RIOEN 0x1000
-#define XIOEN 0x2000
-#define IDLE_EN 0x4000
-
-#define RWDLEN1(value) ((value)<<5)  
-#define RFRLEN1(value) ((value)<<8)  
-
-#define XWDLEN1(value) ((value)<<5)  
-#define XFRLEN1(value) ((value)<<8)  
-
-#define RDATDLY(value) (value)  
-#define RFIG 0x0004
-#define RCOMPAND(value) ((value)<<3)  
-#define RWDLEN2(value) ((value)<<5)  
-#define RFRLEN2(value) ((value)<<8)  
-#define RPHASE 0x8000
-
-#define XDATDLY(value) (value)  
-#define XFIG 0x0004
-#define XCOMPAND(value) ((value)<<3)  
-#define XWDLEN2(value) ((value)<<5)  
-#define XFRLEN2(value) ((value)<<8)  
-#define XPHASE 0x8000
-
-#define CLKGDV(value) (value)  
-#define FWID(value) ((value)<<8)  
-
-#define FPER(value) (value)  
-#define FSGM 0x1000
-#define CLKSM 0x2000
-#define CLKSP 0x4000
-#define GSYNC 0x8000
-
-#define RMCM 0x0001
-#define RCBLK(value) ((value)<<2)  
-#define RPABLK(value) ((value)<<5)  
-#define RPBBLK(value) ((value)<<7)  
-
-#define XMCM(value) (value)  
-#define XCBLK(value) ((value)<<2)  
-#define XPABLK(value) ((value)<<5)  
-#define XPBBLK(value) ((value)<<7)  
-
-struct omap_mcbsp_reg_cfg {
- u16 spcr2;
- u16 spcr1;
- u16 rcr2;
- u16 rcr1;
- u16 xcr2;
- u16 xcr1;
- u16 srgr2;
- u16 srgr1;
- u16 mcr2;
- u16 mcr1;
- u16 pcr0;
- u16 rcerc;
- u16 rcerd;
- u16 xcerc;
- u16 xcerd;
- u16 rcere;
- u16 rcerf;
- u16 xcere;
- u16 xcerf;
- u16 rcerg;
- u16 rcerh;
- u16 xcerg;
- u16 xcerh;
-};
-
-typedef enum {
- OMAP_MCBSP1 = 0,
- OMAP_MCBSP2,
- OMAP_MCBSP3,
-} omap_mcbsp_id;
-
-typedef int __bitwise omap_mcbsp_io_type_t;
-#define OMAP_MCBSP_IRQ_IO ((__force omap_mcbsp_io_type_t) 1)
-#define OMAP_MCBSP_POLL_IO ((__force omap_mcbsp_io_type_t) 2)
-
-typedef enum {
- OMAP_MCBSP_WORD_8 = 0,
- OMAP_MCBSP_WORD_12,
- OMAP_MCBSP_WORD_16,
- OMAP_MCBSP_WORD_20,
- OMAP_MCBSP_WORD_24,
- OMAP_MCBSP_WORD_32,
-} omap_mcbsp_word_length;
-
-typedef enum {
- OMAP_MCBSP_CLK_RISING = 0,
- OMAP_MCBSP_CLK_FALLING,
-} omap_mcbsp_clk_polarity;
-
-typedef enum {
- OMAP_MCBSP_FS_ACTIVE_HIGH = 0,
- OMAP_MCBSP_FS_ACTIVE_LOW,
-} omap_mcbsp_fs_polarity;
-
-typedef enum {
- OMAP_MCBSP_CLK_STP_MODE_NO_DELAY = 0,
- OMAP_MCBSP_CLK_STP_MODE_DELAY,
-} omap_mcbsp_clk_stp_mode;
-
-typedef enum {
- OMAP_MCBSP_SPI_MASTER = 0,
- OMAP_MCBSP_SPI_SLAVE,
-} omap_mcbsp_spi_mode;
-
-struct omap_mcbsp_spi_cfg {
- omap_mcbsp_spi_mode spi_mode;
- omap_mcbsp_clk_polarity rx_clock_polarity;
- omap_mcbsp_clk_polarity tx_clock_polarity;
- omap_mcbsp_fs_polarity fsx_polarity;
- u8 clk_div;
- omap_mcbsp_clk_stp_mode clk_stp_mode;
- omap_mcbsp_word_length word_length;
-};
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/memory.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/memory.h
deleted file mode 100644
index 8b064b8..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/memory.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-#define __virt_to_bus(x) __virt_to_phys(x)
-#define __bus_to_virt(x) __phys_to_virt(x)
-
-#endif
-
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/mtd-xip.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/mtd-xip.h
deleted file mode 100644
index 9b60aef..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/mtd-xip.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ARCH_OMAP_MTD_XIP_H__
-#define __ARCH_OMAP_MTD_XIP_H__
-
-#include <asm/hardware.h>
-#define OMAP_MPU_TIMER_BASE (0xfffec500)
-#define OMAP_MPU_TIMER_OFFSET 0x100
-
-typedef struct {
- u32 cntl;
- u32 load_tim;
- u32 read_tim;
-} xip_omap_mpu_timer_regs_t;
-
-#define xip_omap_mpu_timer_base(n)  ((volatile xip_omap_mpu_timer_regs_t*)IO_ADDRESS(OMAP_MPU_TIMER_BASE +   (n)*OMAP_MPU_TIMER_OFFSET))
-
-#define xip_irqpending()   (omap_readl(OMAP_IH1_ITR) & ~omap_readl(OMAP_IH1_MIR))
-#define xip_currtime() (~xip_omap_mpu_timer_read(0))
-#define xip_elapsed_since(x) (signed)((~xip_omap_mpu_timer_read(0) - (x)) / 6)
-#define xip_cpu_idle() asm volatile ("mcr p15, 0, %0, c7, c0, 4" :: "r" (1))
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/mux.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/mux.h
deleted file mode 100644
index 72da54e..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/mux.h
+++ /dev/null
@@ -1,391 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARCH_MUX_H
-#define __ASM_ARCH_MUX_H
-
-#define PU_PD_SEL_NA 0  
-#define PULL_DWN_CTRL_NA 0  
-
-#define MUX_REG(reg, mode_offset, mode) .mux_reg = FUNC_MUX_CTRL_##reg,   .mask_offset = mode_offset,   .mask = mode,
-
-#define PULL_REG(reg, bit, status) .pull_reg = PULL_DWN_CTRL_##reg,   .pull_bit = bit,   .pull_val = status,
-
-#define PU_PD_REG(reg, status) .pu_pd_reg = PU_PD_SEL_##reg,   .pu_pd_val = status,
-
-#define MUX_REG_730(reg, mode_offset, mode)   .mux_reg = OMAP730_IO_CONF_##reg,   .mask_offset = mode_offset,   .mask = mode,
-
-#define PULL_REG_730(reg, bit, status) .pull_reg = OMAP730_IO_CONF_##reg,   .pull_bit = bit,   .pull_val = status,
-
-#define MUX_CFG(desc, mux_reg, mode_offset, mode,   pull_reg, pull_bit, pull_status,   pu_pd_reg, pu_pd_status, debug_status)  {   .name = desc,   .debug = debug_status,   MUX_REG(mux_reg, mode_offset, mode)   PULL_REG(pull_reg, pull_bit, !pull_status)   PU_PD_REG(pu_pd_reg, pu_pd_status)  },
-
-#define MUX_CFG_730(desc, mux_reg, mode_offset, mode,   pull_bit, pull_status, debug_status) {   .name = desc,   .debug = debug_status,   MUX_REG_730(mux_reg, mode_offset, mode)   PULL_REG_730(mux_reg, pull_bit, pull_status)   PU_PD_REG(NA, 0)  },
-
-#define MUX_CFG_24XX(desc, reg_offset, mode,   pull_en, pull_mode, dbg)  {   .name = desc,   .debug = dbg,   .mux_reg = reg_offset,   .mask = mode,   .pull_val = pull_en,   .pu_pd_val = pull_mode,  },
-
-#define PULL_DISABLED 0
-#define PULL_ENABLED 1
-
-#define PULL_DOWN 0
-#define PULL_UP 1
-
-struct pin_config {
- char *name;
- unsigned char busy;
- unsigned char debug;
-
- const char *mux_reg_name;
- const unsigned int mux_reg;
- const unsigned char mask_offset;
- const unsigned char mask;
-
- const char *pull_name;
- const unsigned int pull_reg;
- const unsigned char pull_val;
- const unsigned char pull_bit;
-
- const char *pu_pd_name;
- const unsigned int pu_pd_reg;
- const unsigned char pu_pd_val;
-};
-
-enum omap730_index {
-
- E2_730_KBR0,
- J7_730_KBR1,
- E1_730_KBR2,
- F3_730_KBR3,
- D2_730_KBR4,
- AA20_730_KBR5,
- V17_730_KBR6,
- C2_730_KBC0,
- D3_730_KBC1,
- E4_730_KBC2,
- F4_730_KBC3,
- E3_730_KBC4,
-
- AA17_730_USB_DM,
- W16_730_USB_PU_EN,
- W17_730_USB_VBUSI,
-
- V19_730_GPIO_15,
- M19_730_GPIO_77,
- C21_730_GPIO_121_122,
- K19_730_GPIO_126,
- K15_730_GPIO_127,
-
- P15_730_GPIO_16_17,
-
- M15_730_GPIO_83,
- N20_730_GPIO_82,
- N18_730_GPIO_81,
- N19_730_GPIO_80,
- L15_730_GPIO_76,
-
- UART1_CTS_RTS,
- OMAP_730_GPIOS_42_43,
- UART1_TX_RX,
- OMAP_730_GPIOS_40_41,
- UART1_USB_RX_TX,
- UART1_USB_RTS,
- UART1_USB_CTS
-};
-
-enum omap1xxx_index {
-
- UART1_TX = 0,
- UART1_RTS,
-
- UART2_TX,
- UART2_RX,
- UART2_CTS,
- UART2_RTS,
-
- UART3_TX,
- UART3_RX,
- UART3_CTS,
- UART3_RTS,
- UART3_CLKREQ,
- UART3_BCLK,
- Y15_1610_UART3_RTS,
-
- PWT,
- PWL,
-
- R18_USB_VBUS,
- R18_1510_USB_GPIO0,
- W4_USB_PUEN,
- W4_USB_CLKO,
- W4_USB_HIGHZ,
- W4_GPIO58,
-
- USB1_SUSP,
- USB1_SEO,
- W13_1610_USB1_SE0,
- USB1_TXEN,
- USB1_TXD,
- USB1_VP,
- USB1_VM,
- USB1_RCV,
- USB1_SPEED,
- R13_1610_USB1_SPEED,
- R13_1710_USB1_SE0,
-
- USB2_SUSP,
- USB2_VP,
- USB2_TXEN,
- USB2_VM,
- USB2_RCV,
- USB2_SEO,
- USB2_TXD,
-
- R18_1510_GPIO0,
- R19_1510_GPIO1,
- M14_1510_GPIO2,
-
- P18_1610_GPIO3,
- Y15_1610_GPIO17,
-
- R18_1710_GPIO0,
- V2_1710_GPIO10,
- N21_1710_GPIO14,
- W15_1710_GPIO40,
-
- MPUIO2,
- N15_1610_MPUIO2,
- MPUIO4,
- MPUIO5,
- T20_1610_MPUIO5,
- W11_1610_MPUIO6,
- V10_1610_MPUIO7,
- W11_1610_MPUIO9,
- V10_1610_MPUIO10,
- W10_1610_MPUIO11,
- E20_1610_MPUIO13,
- U20_1610_MPUIO14,
- E19_1610_MPUIO15,
-
- MCBSP2_CLKR,
- MCBSP2_CLKX,
- MCBSP2_DR,
- MCBSP2_DX,
- MCBSP2_FSR,
- MCBSP2_FSX,
-
- MCBSP3_CLKX,
-
- BALLOUT_V8_ARMIO3,
- N20_HDQ,
-
- W8_1610_MMC2_DAT0,
- V8_1610_MMC2_DAT1,
- W15_1610_MMC2_DAT2,
- R10_1610_MMC2_DAT3,
- Y10_1610_MMC2_CLK,
- Y8_1610_MMC2_CMD,
- V9_1610_MMC2_CMDDIR,
- V5_1610_MMC2_DATDIR0,
- W19_1610_MMC2_DATDIR1,
- R18_1610_MMC2_CLKIN,
-
- M19_1610_ETM_PSTAT0,
- L15_1610_ETM_PSTAT1,
- L18_1610_ETM_PSTAT2,
- L19_1610_ETM_D0,
- J19_1610_ETM_D6,
- J18_1610_ETM_D7,
-
- P20_1610_GPIO4,
- V9_1610_GPIO7,
- W8_1610_GPIO9,
- N20_1610_GPIO11,
- N19_1610_GPIO13,
- P10_1610_GPIO22,
- V5_1610_GPIO24,
- AA20_1610_GPIO_41,
- W19_1610_GPIO48,
- M7_1610_GPIO62,
- V14_16XX_GPIO37,
- R9_16XX_GPIO18,
- L14_16XX_GPIO49,
-
- V19_1610_UWIRE_SCLK,
- U18_1610_UWIRE_SDI,
- W21_1610_UWIRE_SDO,
- N14_1610_UWIRE_CS0,
- P15_1610_UWIRE_CS3,
- N15_1610_UWIRE_CS1,
-
- U19_1610_SPIF_SCK,
- U18_1610_SPIF_DIN,
- P20_1610_SPIF_DIN,
- W21_1610_SPIF_DOUT,
- R18_1610_SPIF_DOUT,
- N14_1610_SPIF_CS0,
- N15_1610_SPIF_CS1,
- T19_1610_SPIF_CS2,
- P15_1610_SPIF_CS3,
-
- L3_1610_FLASH_CS2B_OE,
- M8_1610_FLASH_CS2B_WE,
-
- MMC_CMD,
- MMC_DAT1,
- MMC_DAT2,
- MMC_DAT0,
- MMC_CLK,
- MMC_DAT3,
-
- M15_1710_MMC_CLKI,
- P19_1710_MMC_CMDDIR,
- P20_1710_MMC_DATDIR0,
-
- W9_USB0_TXEN,
- AA9_USB0_VP,
- Y5_USB0_RCV,
- R9_USB0_VM,
- V6_USB0_TXD,
- W5_USB0_SE0,
- V9_USB0_SPEED,
- V9_USB0_SUSP,
-
- W9_USB2_TXEN,
- AA9_USB2_VP,
- Y5_USB2_RCV,
- R9_USB2_VM,
- V6_USB2_TXD,
- W5_USB2_SE0,
-
- R13_1610_UART1_TX,
- V14_16XX_UART1_RX,
- R14_1610_UART1_CTS,
- AA15_1610_UART1_RTS,
- R9_16XX_UART2_RX,
- L14_16XX_UART3_RX,
-
- I2C_SCL,
- I2C_SDA,
-
- F18_1610_KBC0,
- D20_1610_KBC1,
- D19_1610_KBC2,
- E18_1610_KBC3,
- C21_1610_KBC4,
- G18_1610_KBR0,
- F19_1610_KBR1,
- H14_1610_KBR2,
- E20_1610_KBR3,
- E19_1610_KBR4,
- N19_1610_KBR5,
-
- T20_1610_LOW_PWR,
-
- V5_1710_MCLK_ON,
- V5_1710_MCLK_OFF,
- R10_1610_MCLK_ON,
- R10_1610_MCLK_OFF,
-
- P11_1610_CF_CD2,
- R11_1610_CF_IOIS16,
- V10_1610_CF_IREQ,
- W10_1610_CF_RESET,
- W11_1610_CF_CD1,
-};
-
-enum omap24xx_index {
-
- M19_24XX_I2C1_SCL,
- L15_24XX_I2C1_SDA,
- J15_24XX_I2C2_SCL,
- H19_24XX_I2C2_SDA,
-
- W19_24XX_SYS_NIRQ,
-
- W14_24XX_SYS_CLKOUT,
-
- L3_GPMC_WAIT0,
- N7_GPMC_WAIT1,
- M1_GPMC_WAIT2,
- P1_GPMC_WAIT3,
-
- Y15_24XX_MCBSP2_CLKX,
- R14_24XX_MCBSP2_FSX,
- W15_24XX_MCBSP2_DR,
- V15_24XX_MCBSP2_DX,
-
- M21_242X_GPIO11,
- AA10_242X_GPIO13,
- AA6_242X_GPIO14,
- AA4_242X_GPIO15,
- Y11_242X_GPIO16,
- AA12_242X_GPIO17,
- AA8_242X_GPIO58,
- Y20_24XX_GPIO60,
- W4__24XX_GPIO74,
- M15_24XX_GPIO92,
- V14_24XX_GPIO117,
-
- V4_242X_GPIO49,
- W2_242X_GPIO50,
- U4_242X_GPIO51,
- V3_242X_GPIO52,
- V2_242X_GPIO53,
- V6_242X_GPIO53,
- T4_242X_GPIO54,
- Y4_242X_GPIO54,
- T3_242X_GPIO55,
- U2_242X_GPIO56,
-
- AA10_242X_DMAREQ0,
- AA6_242X_DMAREQ1,
- E4_242X_DMAREQ2,
- G4_242X_DMAREQ3,
- D3_242X_DMAREQ4,
- E3_242X_DMAREQ5,
-
- P20_24XX_TSC_IRQ,
-
- K15_24XX_UART3_TX,
- K14_24XX_UART3_RX,
-
- G19_24XX_MMC_CLKO,
- H18_24XX_MMC_CMD,
- F20_24XX_MMC_DAT0,
- H14_24XX_MMC_DAT1,
- E19_24XX_MMC_DAT2,
- D19_24XX_MMC_DAT3,
- F19_24XX_MMC_DAT_DIR0,
- E20_24XX_MMC_DAT_DIR1,
- F18_24XX_MMC_DAT_DIR2,
- E18_24XX_MMC_DAT_DIR3,
- G18_24XX_MMC_CMD_DIR,
- H15_24XX_MMC_CLKI,
-
- T19_24XX_KBR0,
- R19_24XX_KBR1,
- V18_24XX_KBR2,
- M21_24XX_KBR3,
- E5__24XX_KBR4,
- M18_24XX_KBR5,
- R20_24XX_KBC0,
- M14_24XX_KBC1,
- H19_24XX_KBC2,
- V17_24XX_KBC3,
- P21_24XX_KBC4,
- L14_24XX_KBC5,
- N19_24XX_KBC6,
-
- B3__24XX_KBR5,
- AA4_24XX_KBC2,
- B13_24XX_KBC6,
-};
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/omap24xx.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/omap24xx.h
deleted file mode 100644
index 37def2f..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/omap24xx.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARCH_OMAP24XX_H
-#define __ASM_ARCH_OMAP24XX_H
-
-#define L4_24XX_BASE 0x48000000
-#define L3_24XX_BASE 0x68000000
-
-#define OMAP24XX_IC_BASE (L4_24XX_BASE + 0xfe000)
-#define VA_IC_BASE IO_ADDRESS(OMAP24XX_IC_BASE)
-#define OMAP24XX_IVA_INTC_BASE 0x40000000
-#define IRQ_SIR_IRQ 0x0040
-
-#define OMAP24XX_32KSYNCT_BASE (L4_24XX_BASE + 0x4000)
-#define OMAP24XX_PRCM_BASE (L4_24XX_BASE + 0x8000)
-#define OMAP24XX_SDRC_BASE (L3_24XX_BASE + 0x9000)
-
-#define OMAP242X_CONTROL_STATUS (L4_24XX_BASE + 0x2f8)
-
-#endif
-
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/serial.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/serial.h
deleted file mode 100644
index 6ab8613..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/serial.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARCH_SERIAL_H
-#define __ASM_ARCH_SERIAL_H
-
-#define OMAP_MAX_NR_PORTS 3
-#define OMAP1510_BASE_BAUD (12000000/16)
-#define OMAP16XX_BASE_BAUD (48000000/16)
-
-#define is_omap_port(p) ({int __ret = 0;   if (p == IO_ADDRESS(OMAP_UART1_BASE) ||   p == IO_ADDRESS(OMAP_UART2_BASE) ||   p == IO_ADDRESS(OMAP_UART3_BASE))   __ret = 1;   __ret;   })
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/timex.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/timex.h
deleted file mode 100644
index 2c9234c..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/timex.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARCH_OMAP_TIMEX_H
-#define __ASM_ARCH_OMAP_TIMEX_H
-
-#define CLOCK_TICK_RATE (HZ * 100000UL)
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/vmalloc.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/vmalloc.h
deleted file mode 100644
index f2b5b44..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/arch/vmalloc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#define VMALLOC_END (PAGE_OFFSET + 0x10000000)
-
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/atomic.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/atomic.h
deleted file mode 100644
index 6f1921a..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/atomic.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARM_ATOMIC_H
-#define __ASM_ARM_ATOMIC_H
-
-#include <linux/compiler.h>
-
-typedef struct { volatile int counter; } atomic_t;
-
-#define ATOMIC_INIT(i) { (i) }
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/auxvec.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/auxvec.h
deleted file mode 100644
index c7e839c..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/auxvec.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASMARM_AUXVEC_H
-#define __ASMARM_AUXVEC_H
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/bitops.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/bitops.h
deleted file mode 100644
index ff76a68..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/bitops.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARM_BITOPS_H
-#define __ASM_ARM_BITOPS_H
-
-#endif
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/byteorder.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/byteorder.h
deleted file mode 100644
index 4da37bf..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/byteorder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_ARM_BYTEORDER_H
-#define __ASM_ARM_BYTEORDER_H
-
-#include <linux/compiler.h>
-#include <asm/types.h>
-
-static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
-{
- __u32 t;
-
-#ifndef __thumb__
- if (!__builtin_constant_p(x)) {
-
- asm ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x));
- } else
-#endif
- t = x ^ ((x << 16) | (x >> 16));
-
- x = (x << 24) | (x >> 8);
- t &= ~0x00FF0000;
- x ^= (t >> 8);
-
- return x;
-}
-
-#define __arch__swab32(x) ___arch__swab32(x)
-
-#ifndef __STRICT_ANSI__
-#define __BYTEORDER_HAS_U64__
-#define __SWAB_64_THRU_32__
-#endif
-
-#ifdef __ARMEB__
-#include <linux/byteorder/big_endian.h>
-#else
-#include <linux/byteorder/little_endian.h>
-#endif
-
-#endif
-
diff --git a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/cache.h b/ndk/build/platforms/android-3/arch-arm/usr/include/asm/cache.h
deleted file mode 100644
index be26423..0000000
--- a/ndk/build/platforms/android-3/arch-arm/usr/include/asm/cache.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
<