summaryrefslogtreecommitdiffstatshomepage
path: root/android-project
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2016-03-29 08:37:04 +0200
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2016-03-29 08:37:04 +0200
commitf9f360927f0e5575db4edc7f384946b43e52831b (patch)
tree9b8a081c61f81725f3b1cf2c1b06905fd8f3ab9b /android-project
parent953d0f9b17f0d3878d61b868e8abfa202c305866 (diff)
Added license and cleanup for android-project (nw)
Diffstat (limited to 'android-project')
-rw-r--r--android-project/LICENSE27
-rw-r--r--android-project/README.md9
-rw-r--r--android-project/app/src/main/res/layout/main.xml2
3 files changed, 37 insertions, 1 deletions
diff --git a/android-project/LICENSE b/android-project/LICENSE
new file mode 100644
index 00000000000..4d9210d10e1
--- /dev/null
+++ b/android-project/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2016, MAME Development Team
+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 bsd3 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 HOLDER 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/android-project/README.md b/android-project/README.md
new file mode 100644
index 00000000000..df7f5e5f262
--- /dev/null
+++ b/android-project/README.md
@@ -0,0 +1,9 @@
+# **android-project** #
+
+Cointains code by needed to run MAME on Android
+
+Licensed under [The BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause)
+
+It also contains org.libsdl.app.Activity part of SDL2 project under [zlib license](http://opensource.org/licenses/Zlib)
+
+And for building Gradle-wrapper is used that is under [Apache License, Version 2.0](http://opensource.org/licenses/Apache-2.0) \ No newline at end of file
diff --git a/android-project/app/src/main/res/layout/main.xml b/android-project/app/src/main/res/layout/main.xml
index 123c4b6eac5..d9995839961 100644
--- a/android-project/app/src/main/res/layout/main.xml
+++ b/android-project/app/src/main/res/layout/main.xml
@@ -7,7 +7,7 @@
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="Hello World, SDLActivity"
+ android:text="MAME"
/>
</LinearLayout>