X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=README.md;h=d154302ac8dffd57f56073fadd202247b114f0f8;hb=7a12d832394176890ae9cbe8c869c655b290eac1;hp=3de790b2763726456bcb9189ed683cd15d5ca963;hpb=20dc7bbe285c1143911f2103af3bcb8de6fad985;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

diff --git a/README.md b/README.md
index 3de790b..d154302 100644
--- a/README.md
+++ b/README.md
@@ -12,16 +12,22 @@
          * [SMACK enabled Targets](#smack-enabled-targets)
          * [DEBUG Builds](#debug-builds-1)
    * [Creating an example](#creating-an-example)
-   * [Installing Emscripten Examples](#installing-emscripten-examples)
 
 # Build Instructions
 
 ## 1. Building for Ubuntu desktop
 
-### Minimum Requirements
+### Requirements
 
- - Ubuntu 14.04 or later
+ - Ubuntu 16.04 or later
  - Environment created using dali_env script in dali-core repository
+ - GCC version 6
+
+DALi requires a compiler supporting C++11 features.
+Ubuntu 16.04 is the first version to offer this by default (GCC v5.4.0).
+
+GCC version 6 is recommended since it has fixes for issues in version 5
+e.g. it avoids spurious 'defined but not used' warnings in header files.
 
 ### Building the Repository
 
@@ -66,14 +72,33 @@ Before running make install as normal:
  - Modify "com.samsung.dali-demo.xml" to include your example so that it can be launched on target.
  - No changes are required to the make system as long as the above is followed, your example will be automatically built & installed.
 
-# Installing Emscripten Examples
+## 3. Building for Android
+
+### Requirements
+
+ - Ubuntu 16.04 or later
+ - GCC version 6
+
+### Building the Repository
+
+To build the repository enter the 'build/android' folder:
+
+         $ cd dali-demo/build/android
+
+Then run the following command:
+
+         $ ./build.sh
+
+For debug build:
+
+         $ DEBUG=1 ./build.sh
+
+To clean the build:
 
-Some Emscripten Javascript examples are included in dali-demo.
+         $ ./build.sh clean
 
-They do not require building, to install them run the provided install script.
-Note: Your dali-env must be setup as it will install to your dali-env/opt/share/emscripten directory.
+To install apks:
 
-         $ cd ./emscripten-examples
-         $ ./install.sh
+         $ adb install -r ./app/build/outputs/apk/debug/dali-demo-debug.apk
+         $ adb install -r ./app/build/outputs/apk/release/dali-demo-release.apk
 
-Run the examples by either opening them in a browser, or, running the browser from the command line with an example as a parameter.