diff --git a/docs/html/sdk/ndk/index.jd b/docs/html/sdk/ndk/index.jd index 9e88d944601d2..11e6642ceb2cb 100644 --- a/docs/html/sdk/ndk/index.jd +++ b/docs/html/sdk/ndk/index.jd @@ -60,511 +60,500 @@ padding: .25em 1em;
- - -Android NDK, Revision 4b (June 2010) -
-
-
NDK r4b notes:
-

Includes fixes for several issues in the NDK build and debugging scripts -— if you are using NDK r4, we recommend downloading the NDK r4b build. For -detailed information the changes in this release, read the CHANGES.TXT document -included in the downloaded NDK package.

-
- -
-
General notes:
- -
-
    -
  • Provides a simplified build system through the new ndk-build build -command.
  • -
  • Adds support for easy native debugging of generated machine code on production -devices through the new ndk-gdb command.
  • -
  • Adds a new Android-specific ABI for ARM-based CPU architectures, -armeabi-v7a. The new ABI extends the existing armeabi -ABI to include these CPU instruction set extensions: -
      -
    • Thumb-2 instructions
    • -
    • VFP hardware FPU instructions (VFPv3-D16)
    • -
    • Optional support for ARM Advanced SIMD (NEON) GCC intrinsics and VFPv3-D32. -Supported by devices such as Verizon Droid by Motorola, Google Nexus One, and -others.
    • -
    -
  • Adds a new cpufeatures static library (with sources) that lets -your app detect the host device's CPU features at runtime. Specifically, -applications can check for ARMv7-A support, as well as VFPv3-D32 and NEON -support, then provide separate code paths as needed.
  • -
  • Adds a sample application, hello-neon, that illustrates how to -use the cpufeatures library to check CPU features and then provide -an optimized code path using NEON instrinsics, if -supported by the CPU.
  • -
  • Lets you generate machine code for either or both of the instruction sets -supported by the NDK. For example, you can build for both ARMv5 and ARMv7-A -architectures at the same time and have everything stored to your application's -final .apk.
  • -
  • To ensure that your applications are available to users only if their -devices are capable of running them, Android Market now filters applications -based on the instruction set information included in your application — no -action is needed on your part to enable the filtering. Additionally, the Android -system itself also checks your application at install time and allows the -installation to continue only if the application provides a library that is -compiled for the device's CPU architecture.
  • -
  • Adds support for Android 2.2, including a new stable API for accessing -the pixel buffers of {@link android.graphics.Bitmap} objects from native -code.
  • -
-
-
-
-
- -
- - -Android NDK, Revision 3 (March 2010) -
- -
-
General notes:
- -
-
    -
  • Adds OpenGL ES 2.0 native library support.
  • -
  • Adds a sample application,hello-gl2, that illustrates the use of -OpenGL ES 2.0 vertex and fragment shaders.
  • -
  • The toolchain binaries have been refreshed for this release with GCC 4.4.0, which should generate slightly more compact and efficient machine code than the previous one (4.2.1). The NDK also still provides the 4.2.1 binaries, which you can optionally use to build your machine code.
  • -
-
-
-
-
- -
- - -Android NDK, Revision 2 (September 2009) -
- -

Originally released as "Android 1.6 NDK, Release 1".

-
-
General notes:
-
-
    -
  • Adds OpenGL ES 1.1 native library support.
  • -
  • Adds a sample application, san-angeles, that renders 3D -graphics through the native OpenGL ES APIs, while managing activity -lifecycle with a {@link android.opengl.GLSurfaceView} object. -
  • -
-
-
-
-
- -
- - -Android NDK, Revision 1 (June 2009) -
- -

Originally released as "Android 1.5 NDK, Release 1".

-
-
General notes:
-
-
    -
  • Includes compiler support (GCC) for ARMv5TE instructions, including Thumb-1 -instructions.
  • -
  • Includes system headers for stable native APIs, documentation, and sample -applications.
  • -
-
- -
-
-
- - -

What is the Android NDK?

- -

The Android NDK is a toolset that lets you embed components that make use -of native code in your Android applications. -

- -

Android applications run in the Dalvik virtual machine. The NDK allows -you to implement parts of your applications using native-code languages -such as C and C++. This can provide benefits to certain classes of applications, -in the form of reuse of existing code and in some cases increased speed.

- -

The NDK provides:

- - - -

The latest release of the NDK supports these ARM instruction sets:

- - -

Future releases of the NDK will also support:

- - - -

ARMv5TE machine code will run on all ARM-based Android devices. ARMv7-A will -run only on devices such as the Verizon Droid or Google Nexus One that have a -compatible CPU. The main difference between the two instruction sets is that -ARMv7-A supports hardware FPU, Thumb-2, and NEON instructions. You can target -either or both of the instruction sets — ARMv5TE is the default, but -switching to ARMv7-A is as easy as adding a single line to the application's -Application.mk file, without needing to change anything else in the file. You -can also build for both architectures at the same time and have everything -stored in the final .apk. For complete information is provided in the -CPU-ARCH-ABIS.TXT in the NDK package.

- -

The NDK provides stable headers for libc (the C library), libm (the Math -library), OpenGL ES (3D graphics library), the JNI interface, and other -libraries, as listed in the section below.

- -

The NDK will not benefit most applications. As a developer, you will need -to balance its benefits against its drawbacks; notably, using native code does -not result in an automatic performance increase, but does always increase -application complexity. Typical good candidates for the NDK are self-contained, -CPU-intensive operations that don't allocate much memory, such as signal processing, -physics simulation, and so on. Simply re-coding a method to run in C usually does -not result in a large performance increase. The NDK can, however, can be -an effective way to reuse a large corpus of existing C/C++ code.

- -

Please note that the NDK does not enable you to develop native-only -applications. Android's primary runtime remains the Dalvik virtual machine.

- -

Contents of the NDK

- -

Development tools

- -

The NDK includes a set of cross-toolchains (compilers, linkers, etc..) that -can generate native ARM binaries on Linux, OS X, and Windows (with Cygwin) -platforms.

- -

It provides a set of system headers for stable native APIs that are -guaranteed to be supported in all later releases of the platform:

- - - -

The NDK also provides a build system that lets you work efficiently with your -sources, without having to handle the toolchain/platform/CPU/ABI details. You -create very short build files to describe which sources to compile and which -Android application will use them — the build system compiles the sources -and places the shared libraries directly in your application project.

- -

Important: With the exception of the -libraries listed above, native system libraries in the Android platform are -not stable and may change in future platform versions. -Your applications should only make use of the stable native system -libraries provided in this NDK.

- -

Documentation

- -

The NDK package includes a set of documentation that describes the -capabilities of the NDK and how to use it to create shared libraries for your -Android applications. In this release, the documentation is provided only in the -downloadable NDK package. You can find the documentation in the -<ndk>/docs/ directory. Included are these files:

- - - -

Additionally, the package includes detailed information about the "bionic" -C library provided with the Android platform that you should be aware of, if you -are developing using the NDK. You can find the documentation in the -<ndk>/docs/system/libc/ directory:

- - - -

Sample applications

- -

The NDK includes sample Android applications that illustrate how to use -native code in your Android applications. For more information, see -Using the Sample Applications.

- -

System and Software Requirements

- -

The sections below describe the system and software requirements for using -the Android NDK, as well as platform compatibility considerations that affect -appplications using libraries produced with the NDK.

- -

The Android SDK

- - -

Supported operating systems

- - -

Required development tools

- - -

Android platform compatibility

- - -

Installing the NDK

- -

Installing the NDK on your development computer is straightforward and -involves extracting the NDK from its download package. Unlike previous releases, -there is no need to run a host-setup script.

- -

Before you get started make sure that you have downloaded the latest Android SDK and upgraded your applications -and environment as needed. The NDK will not work with older versions of the -Android SDK. Also, take a moment to review the System -and Software Requirements for the NDK, if you haven't already.

- -

To install the NDK, follow these steps:

- -
    -
  1. From the table at the top of this page, select the NDK package that is -appropriate for your development computer and download the package.
  2. -
  3. Uncompress the NDK download package using tools available on your computer. -When uncompressed, the NDK files are contained in a directory called -android-ndk-<version>. You can rename the NDK directory if -necessary and you can move it to any location on your computer. This -documentation refers to the NDK directory as <ndk>.
  4. -
- -

You are now ready start working with the NDK.

- -

Getting Started with the NDK

- -

Once you've installed the NDK successfully, take a few minutes to read the -documentation included in the NDK. You can find the documentation in the -<ndk>/docs/ directory. In particular, please read the -OVERVIEW.TXT document completely, so that you understand the intent of the NDK -and how to use it.

- -

If you used a previous version of the NDK, take a moment to review the -list of NDK changes in the CHANGES.TXT document.

- -

Here's the general outline of how you work with the NDK tools:

- -
    -
  1. Place your native sources under -<project>/jni/...
  2. -
  3. Create <project>/jni/Android.mk to -describe your native sources to the NDK build system
  4. -
  5. Optional: Create <project>/jni/Application.mk.
  6. -
  7. Build your native code by running the 'ndk-build' script from your projet's directory. -It is located in the top-level NDK directory: - -

    -$ cd <project>
    -$ <ndk>/ndk-build
    -

    - -

    The build tools copy the stripped, shared libraries needed by your -application to the proper location in the application's project directory.

    -
  8. - -
  9. Finally, compile your application using the SDK tools in the usual way. The -SDK build tools will package the shared libraries in the application's -deployable .apk file.

  10. - -
- -

For complete information on all of the steps listed above, please see the -documentation included with the NDK package.

- - -

Using the Sample Applications

- -

The NDK includes sample applications that illustrate how to use native -code in your Android applications:

- - - -

For each sample, the NDK includes the corresponding C source code and the -necessary Android.mk and Application.mk files. There are located under -<ndk>/samples/<name>/ and their source code can be found under -<ndk>/samples/<name>/jni/.

- -

You can build the shared libraries for the sample apps by going into <ndk>/samples/<name>/ -then calling the ndk-build command. The generated shared libraries will be located under -<ndk>/samples/<name>/libs/armeabi/ for (ARMv5TE machine code) and/or -<ndk>/samples/<name>/libs/armeabi-v7a/ for (ARMv7 machine code). -

- -

Next, build the sample Android applications that use the shared -libraries:

- - - -

Discussion Forum and Mailing List

- -

If you have questions about the NDK or would like to read or contribute to -discussions about it, please visit the android-ndk group and -mailing list.

+ Android NDK, Revision 5 (November 2010) + +
+
+
NDK r5 notes:
+ +
+

The r5 release of the NDK includes many new APIs, many of which are introduced to + support native game development and applications that require similar requirements. Most + notably, native activities are now supported, which allow you to write an application + entirely with native code. For detailed information describing the changes in this + release, read the CHANGES.HTML document included in the downloaded NDK package.

+
+
+ +
+
General notes:
+ +
+
    +
  • Adds support for native activities, which allows you to write completely native + applications.
  • + +
  • Adds an EGL library that lets you create and manage OpenGL ES textures and + services.
  • + +
  • Provides an interface that lets you write a native text-to-speech engine.
  • + +
  • Adds native support for the following: + +
      +
    • the input subsystem (such as the keyboard and touch screen)
    • + +
    • the window and surface subsystem.
    • + +
    • audio APIs based on the OpenSL ES standard that support playback and recording + as well as control over platform audio effects.
    • + +
    • event loop APIs to wait for things such as input and sensor events.
    • + +
    • accessing assets packaged in an .apk file.
    • + +
    • accessing sensor data (accelerometer, compass, gyroscope, etc).
    • + +
    • provides sample applications, native-plasma and + native-activity, to demonstrate how to write a native activity.
    • +
    +
  • +
+
+
+
+ + +
+ Android NDK, Revision 4b (June 2010) + +
+
+
NDK r4b notes:
+ +
+

Includes fixes for several issues in the NDK build and debugging scripts — if + you are using NDK r4, we recommend downloading the NDK r4b build. For detailed + information describing the changes in this release, read the CHANGES.TXT document + included in the downloaded NDK package.

+
+
+ +
+
General notes:
+ +
+
    +
  • Provides a simplified build system through the new ndk-build build + command.
  • + +
  • Adds support for easy native debugging of generated machine code on production + devices through the new ndk-gdb command.
  • + +
  • Adds a new Android-specific ABI for ARM-based CPU architectures, + armeabi-v7a. The new ABI extends the existing armeabi ABI to + include these CPU instruction set extensions: + +
      +
    • Thumb-2 instructions
    • + +
    • VFP hardware FPU instructions (VFPv3-D16)
    • + +
    • Optional support for ARM Advanced SIMD (NEON) GCC intrinsics and VFPv3-D32. + Supported by devices such as Verizon Droid by Motorola, Google Nexus One, and + others.
    • +
    +
  • + +
  • Adds a new cpufeatures static library (with sources) that lets your + app detect the host device's CPU features at runtime. Specifically, applications can + check for ARMv7-A support, as well as VFPv3-D32 and NEON support, then provide separate + code paths as needed.
  • + +
  • Adds a sample application, hello-neon, that illustrates how to use the + cpufeatures library to check CPU features and then provide an optimized + code path using NEON instrinsics, if supported by the CPU.
  • + +
  • Lets you generate machine code for either or both of the instruction sets supported + by the NDK. For example, you can build for both ARMv5 and ARMv7-A architectures at the + same time and have everything stored to your application's final + .apk.
  • + +
  • To ensure that your applications are available to users only if their devices are + capable of running them, Android Market now filters applications based on the + instruction set information included in your application — no action is needed on + your part to enable the filtering. Additionally, the Android system itself also checks + your application at install time and allows the installation to continue only if the + application provides a library that is compiled for the device's CPU architecture.
  • + +
  • Adds support for Android 2.2, including a new stable API for accessing the pixel + buffers of {@link android.graphics.Bitmap} objects from native code.
  • +
+
+
+
+
+ +
+ Android NDK, Revision 3 (March 2010) + +
+
+
General notes:
+ +
+
    +
  • Adds OpenGL ES 2.0 native library support.
  • + +
  • Adds a sample application,hello-gl2, that illustrates the use of + OpenGL ES 2.0 vertex and fragment shaders.
  • + +
  • The toolchain binaries have been refreshed for this release with GCC 4.4.0, which + should generate slightly more compact and efficient machine code than the previous one + (4.2.1). The NDK also still provides the 4.2.1 binaries, which you can optionally use + to build your machine code.
  • +
+
+
+
+
+ +
+ Android NDK, Revision 2 (September 2009) + +
+

Originally released as "Android 1.6 NDK, Release 1".

+ +
+
General notes:
+ +
+
    +
  • Adds OpenGL ES 1.1 native library support.
  • + +
  • Adds a sample application, san-angeles, that renders 3D graphics + through the native OpenGL ES APIs, while managing activity lifecycle with a {@link + android.opengl.GLSurfaceView} object.
  • +
+
+
+
+
+ +
+ Android NDK, Revision 1 (June 2009) + +
+

Originally released as "Android 1.5 NDK, Release 1".

+ +
+
General notes:
+ +
+
    +
  • Includes compiler support (GCC) for ARMv5TE instructions, including Thumb-1 + instructions.
  • + +
  • Includes system headers for stable native APIs, documentation, and sample + applications.
  • +
+
+
+
+
+ +

Installing the NDK

+

Installing the NDK on your development computer is straightforward and involves extracting the + NDK from its download package. Unlike previous releases, there is no need to run a host-setup + script.

+ +

Before you get started make sure that you have downloaded the latest Android SDK and upgraded your applications and environment as + needed. The NDK will not work with older versions of the Android SDK. Also, take a moment to + review the System and Software Requirements for the + NDK, if you haven't already.

+ +

To install the NDK, follow these steps:

+ +
    +
  1. From the table at the top of this page, select the NDK package that is appropriate for your + development computer and download the package.
  2. + +
  3. Uncompress the NDK download package using tools available on your computer. When + uncompressed, the NDK files are contained in a directory called + android-ndk-<version>. You can rename the NDK directory if necessary and you + can move it to any location on your computer. This documentation refers to the NDK directory as + <ndk>.
  4. +
+ +

You are now ready start working with the NDK.

+ +

Getting Started with the NDK

+ +

Once you've installed the NDK successfully, take a few minutes to read the documentation + included in the NDK. You can find the documentation in the <ndk>/docs/ + directory. In particular, please read the OVERVIEW.HTML document completely, so that you + understand the intent of the NDK and how to use it.

+ +

If you used a previous version of the NDK, take a moment to review the list of NDK changes in + the CHANGES.HTML document.

+ +

Here's the general outline of how you work with the NDK tools:

+ +
    +
  1. Place your native sources under <project>/jni/...
  2. + +
  3. Create <project>/jni/Android.mk to describe your native sources to the + NDK build system
  4. + +
  5. Optional: Create <project>/jni/Application.mk.
  6. + +
  7. Build your native code by running the 'ndk-build' script from your project's directory. It + is located in the top-level NDK directory: +
    +cd <project>
    +<ndk>/ndk-build
    +
    + +

    The build tools copy the stripped, shared libraries needed by your application to the + proper location in the application's project directory.

    +
  8. + +
  9. Finally, compile your application using the SDK tools in the usual way. The SDK build tools + will package the shared libraries in the application's deployable .apk file.
  10. +
+

For complete information on all of the steps listed above, please see the documentation + included with the NDK package.

+

Sample Applications

+ +

The NDK includes sample applications that illustrate how to use native code in your Android + applications:

+ + +

For each sample, the NDK includes the corresponding C source code and the necessary Android.mk + and Application.mk files. There are located under <ndk>/samples/<name>/ + and their source code can be found under <ndk>/samples/<name>/jni/.

+ +

You can build the shared libraries for the sample apps by going into + <ndk>/samples/<name>/ then calling the ndk-build command. + The generated shared libraries will be located under + <ndk>/samples/<name>/libs/armeabi/ for (ARMv5TE machine code) and/or + <ndk>/samples/<name>/libs/armeabi-v7a/ for (ARMv7 machine code).

+ +

Next, build the sample Android applications that use the shared libraries:

+ + + +

Exploring the hello-jni Sample

+ +

The hello-jni sample is a simple demonstration on how to use JNI from an Android application. + The HelloJni activity receives a string from a simple C function and displays it in a + TextView.

+ +

The main components of the sample include:

+ + + +
    +
  1. Create a new project in Eclipse from the existing sample source or use the + android tool to update the project so it generates a build.xml file that you can + use to build the sample. + + +
  2. + +
  3. Compile the native code using the ndk-build command. +
    +cd <ndk-root>/samples/hello-jni
    +<ndk_root>/ndk-build
    +
    +
  4. + +
  5. Build and install the application as you would a normal Android application. If you are + using Eclipse, run the application to build and install it on a device. If you are using Ant, + run the following commands from the project directory: +
    +ant debug
    +adb install bin/HelloJni-debug.apk
    +
    +
  6. +
+ +

When you run the application on the device, the string Hello JNI should appear on + your device. You can explore the rest of the samples that are located in the + <ndk-root>/samples directory for more examples on how to use the JNI.

+ +

Exploring the native-activity Sample Application

+ +

The native-activity sample provided with the Android NDK demonstrates how to use the + android_native_app_glue static library. This static library makes creating a native activity + easier by providing you with an implementation that handles your callbacks in another thread, so + you do not have to worry about them blocking your main UI thread. The main parts of the sample + are described below:

+ + + +

To build this sample application:

+ +
    +
  1. Create a new project in Eclipse from the existing sample source or use the + android tool to update the project so it generates a build.xml file that you can + use to build the sample. + + +
  2. + +
  3. Compile the native code using the ndk-build command. +
    +cd <ndk-root>/platforms/samples/android-9/samples/native-activity
    +<ndk_root>/ndk-build
    +
    +
  4. + +
  5. Build and install the application as you would a normal Android application. If you are + using Eclipse, run the application to build and install it on a device. If you are using Ant, + run the following commands in the project directory, then run the application on the device: +
    +ant debug
    +adb install bin/NativeActivity-debug.apk
    +
    +
  6. +
+ +

Discussion Forum and Mailing List

+ +

If you have questions about the NDK or would like to read or contribute to discussions about + it, please visit the android-ndk group + and mailing list.

diff --git a/docs/html/sdk/ndk/overview.jd b/docs/html/sdk/ndk/overview.jd new file mode 100644 index 0000000000000..a7ec5d42a1103 --- /dev/null +++ b/docs/html/sdk/ndk/overview.jd @@ -0,0 +1,334 @@ +page.title=What is the NDK? +@jd:body + +
+
+

In this document

+ +
    +
  1. When to Develop in Native Code
  2. + +
  3. + Contents of the NDK + +
      +
    1. Development tools
    2. + +
    3. Documentation
    4. + +
    5. Sample applications
    6. +
    +
  4. + +
  5. System and Software Requirements
  6. + +
+
+
+ +

The Android NDK is a toolset that lets you embed components that make use of native code in + your Android applications.

+ +

Android applications run in the Dalvik virtual machine. The NDK allows you to implement parts + of your applications using native-code languages such as C and C++. This can provide benefits to + certain classes of applications, in the form of reuse of existing code and in some cases + increased speed.

+ +

The NDK provides:

+ + + +

The latest release of the NDK supports these ARM instruction sets:

+ + + +

Future releases of the NDK will also support:

+ + + +

ARMv5TE machine code will run on all ARM-based Android devices. ARMv7-A will run only on + devices such as the Verizon Droid or Google Nexus One that have a compatible CPU. The main + difference between the two instruction sets is that ARMv7-A supports hardware FPU, Thumb-2, and + NEON instructions. You can target either or both of the instruction sets — ARMv5TE is the + default, but switching to ARMv7-A is as easy as adding a single line to the application's + Application.mk file, without needing to change anything else in the file. You can also build for + both architectures at the same time and have everything stored in the final .apk. + Complete information is provided in the CPU-ARCH-ABIS.HTML in the NDK package.

+ +

The NDK provides stable headers for libc (the C library), libm (the Math library), OpenGL ES + (3D graphics library), the JNI interface, and other libraries, as listed in the Development Tools section.

+ +

When to Develop in Native Code

+ +

The NDK will not benefit most applications. As a developer, you need to balance its benefits + against its drawbacks; notably, using native code does not result in an automatic performance + increase, but always increases application complexity. In general, you should only use native + code if it is essential to your application, not just because you prefer to program in C/C++.

+ +

Typical good candidates for the NDK are self-contained, CPU-intensive operations that don't + allocate much memory, such as signal processing, physics simulation, and so on. Simply re-coding + a method to run in C usually does not result in a large performance increase. When examining + whether or not you should develop in native code, think about your requirements and see if the + Android framework APIs provide the functionality that you need. The NDK can, however, can be an + effective way to reuse a large corpus of existing C/C++ code.

+ +

The Android framework provides two ways to use native code:

+ + + +

Contents of the NDK

The NDK contains the APIs, documentation, and sample + applications that help you write your native code. + +

Development tools

+ +

The NDK includes a set of cross-toolchains (compilers, linkers, etc..) that can generate + native ARM binaries on Linux, OS X, and Windows (with Cygwin) platforms.

+ +

It provides a set of system headers for stable native APIs that are guaranteed to be supported + in all later releases of the platform:

+ + + +

The NDK also provides a build system that lets you work efficiently with your sources, without + having to handle the toolchain/platform/CPU/ABI details. You create very short build files to + describe which sources to compile and which Android application will use them — the build + system compiles the sources and places the shared libraries directly in your application + project.

+ +

Important: With the exception of the libraries listed above, + native system libraries in the Android platform are not stable and may change in future + platform versions. Your applications should only make use of the stable native system + libraries provided in this NDK.

+ +

Documentation

+ +

The NDK package includes a set of documentation that describes the capabilities of the NDK and + how to use it to create shared libraries for your Android applications. In this release, the + documentation is provided only in the downloadable NDK package. You can find the documentation in + the <ndk>/docs/ directory. Included are these files:

+ + + +

Additionally, the package includes detailed information about the "bionic" C library provided + with the Android platform that you should be aware of, if you are developing using the NDK. You + can find the documentation in the <ndk>/docs/system/libc/ directory:

+ + + +

Sample applications

+ +

The NDK includes sample Android applications that illustrate how to use native code in your + Android applications. For more information, see Sample Applications.

+ +

System and Software Requirements

+ +

The sections below describe the system and software requirements for using the Android NDK, as + well as platform compatibility considerations that affect appplications using libraries produced + with the NDK.

+ +

The Android SDK

+ + + +

Supported operating systems

+ + + +

Required development tools

+ + + +

Android platform compatibility

+ + \ No newline at end of file diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs index 7b9a5a2bbdde6..ecc69c2c294bf 100644 --- a/docs/html/sdk/sdk_toc.cs +++ b/docs/html/sdk/sdk_toc.cs @@ -101,7 +101,7 @@ - + new!
  • @@ -115,9 +115,11 @@
  • +
  • More Information