demos: Clean up APK creation for cube and tri

Instead of moving manifest files, run the following commands:

  android update project -s -p . -t "android-23"
  ant -buildfile cube debug
  ant -buildfile tri debug

And the APKs can coexist:

  ./cube/bin/NativeActivity-debug.apk
  ./tri/bin/NativeActivity-debug.apk

diff --git a/demos/android/AndroidManifest.xml.cube b/demos/android/cube/AndroidManifest.xml
similarity index 100%
rename from demos/android/AndroidManifest.xml.cube
rename to demos/android/cube/AndroidManifest.xml

diff --git a/demos/android/cube/custom_rules.xml b/demos/android/cube/custom_rules.xml
new file mode 100644 (file)
index 0000000..335c1c3
--- /dev/null
+++ b/demos/android/cube/custom_rules.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="NativeActivity" default="help">
+<!-- Point ndk-build at the libs created in common dir -->
+<echo>cube: Overriding native.libs.absolute.dir with ../libs</echo>
+<property name="native.libs.absolute.dir" location="../libs" />
+</project>

diff --git a/demos/android/res/values/strings.xml b/demos/android/cube/res/values/strings.xml
similarity index 100%
rename from demos/android/res/values/strings.xml
rename to demos/android/cube/res/values/strings.xml

diff --git a/demos/android/AndroidManifest.xml.tri b/demos/android/tri/AndroidManifest.xml
similarity index 100%
rename from demos/android/AndroidManifest.xml.tri
rename to demos/android/tri/AndroidManifest.xml

diff --git a/demos/android/tri/custom_rules.xml b/demos/android/tri/custom_rules.xml
new file mode 100644 (file)
index 0000000..335c1c3
--- /dev/null
+++ b/demos/android/tri/custom_rules.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="NativeActivity" default="help">
+<!-- Point ndk-build at the libs created in common dir -->
+<echo>cube: Overriding native.libs.absolute.dir with ../libs</echo>
+<property name="native.libs.absolute.dir" location="../libs" />
+</project>

diff --git a/demos/android/tri/res/values/strings.xml b/demos/android/tri/res/values/strings.xml
new file mode 100644 (file)
index 0000000..fdac5f9
--- /dev/null
+++ b/demos/android/tri/res/values/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 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="app_name">Demos</string>
+
+</resources>