Skip to content

Commit

Permalink
Merge pull request android#7 from googlesamples/master
Browse files Browse the repository at this point in the history
merge code
  • Loading branch information
playbar authored Feb 23, 2017
2 parents 63ba8e2 + 4fc1943 commit 158e8c7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ NDK Samples [![Build Status](https://travis-ci.org/googlesamples/android-ndk.svg

This repository contains [Android NDK][0] samples with Android Studio [C++ integration](https://www.youtube.com/watch?v=f7ihSQ44WO0&feature=youtu.be).

These samples uses the new [CMake Android plugin](http://tools.android.com/tech-docs/external-c-builds) with C++ support.
These samples uses the new [CMake Android plugin](https://developer.android.com/studio/projects/add-native-code.html) with C++ support.

Additional Android Studio samples:
- [Google Play Game Samples with Android Studio](https://github.com/playgameservices/cpp-android-basic-samples)
Expand All @@ -19,7 +19,7 @@ For samples using `Android.mk` build system with `ndk-build` see the [android-mk

Build Steps
----------
- With Android Studio: use "Import Project(Eclipse ADT, Gradle, etc)" or "File" > "Import Projec"t option
- With Android Studio: use "Import Project(Eclipse ADT, Gradle, etc)" or "File" > "Import Project" option
- On Command Line/Terminal: make sure set up ANDROID_HOME and ANDROID_NDK_HOME to local installation of SDK and NDK, then go to individual sample dir, and use "gradlew assembleDebug"

Support
Expand Down

0 comments on commit 158e8c7

Please sign in to comment.