# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1429834817 -10800
# Node ID fe78cf853157a51640d325184164a817a1d8f3a8
# Parent  1310df7cdf2500bc3031b4cc77c94de00439969e
fixed the build files

diff -r 1310df7cdf25 -r fe78cf853157 AndroidManifest.xml
--- a/AndroidManifest.xml	Thu Apr 23 20:54:02 2015 +0300
+++ b/AndroidManifest.xml	Fri Apr 24 03:20:17 2015 +0300
@@ -6,13 +6,13 @@
 
 	<uses-sdk android:minSdkVersion="9"/>
 
-	<application android:label="@string/app_name"
+	<application android:label="app-newtest"
 			android:hasCode="false"
-			android:debuggable="true"
-			android:icon="@drawable/ic_launcher">
+			android:debuggable="true">
+			<!-- android:icon="@drawable/ic_launcher" -->
 
 		<activity android:name="android.app.NativeActivity"
-			android:label="@string/app_name">
+			android:label="New NDK Test">
 
 			<meta-data android:name="android.app.lib_name" android:value="ndktest"/>
 
diff -r 1310df7cdf25 -r fe78cf853157 Makefile
--- a/Makefile	Thu Apr 23 20:54:02 2015 +0300
+++ b/Makefile	Fri Apr 24 03:20:17 2015 +0300
@@ -1,4 +1,4 @@
-android_platform = android-21
+android_platform = android-22
 
 src = $(wildcard src/*.c)
 obj = $(src:.c=.o)
@@ -25,10 +25,10 @@
 .PHONY: release
 release: $(apk-release)
 
-$(apk-debug): $(lib)
+$(apk-debug): $(lib) AndroidManifest.xml
 	ant debug
 
-$(apk-release): $(lib)
+$(apk-release): $(lib) AndroidManifest.xml
 	ant release
 
 .PHONY: lib
@@ -60,3 +60,7 @@
 .PHONY: stop
 stop:
 	adb shell am force-stop $(pkg)
+
+.PHONY: update-project
+update-project: build.xml
+	android update project --path . --target $(android_platform)
diff -r 1310df7cdf25 -r fe78cf853157 build.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build.xml	Fri Apr 24 03:20:17 2015 +0300
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="ndktest" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>