From c1bfc3c72b566312e4da7d801d69cb1dccafea7f Mon Sep 17 00:00:00 2001 From: guanghuafan Date: Tue, 4 Oct 2016 20:16:22 -0700 Subject: [PATCH] Restore origin commented code for hello-libs/settings.gradle to fix bug: https://github.com/googlesamples/android-ndk/issues/301 --- hello-libs/README.md | 9 ++++++--- hello-libs/settings.gradle | 9 +++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/hello-libs/README.md b/hello-libs/README.md index 4851dc4c3..c920c3156 100644 --- a/hello-libs/README.md +++ b/hello-libs/README.md @@ -1,12 +1,15 @@ Hello-libs ========= -Hello-Libs is an Android sample that demos native lib management in Android Studio. +Hello-Libs is an Android sample that demos native lib management in Android Studio: +* how external pre-build static lib (gmath) could be used in app +* how external pre-built shared lib (gperf) could be used in app This sample uses the new [Android Studio CMake plugin](http://tools.android.com/tech-docs/external-c-builds) with external lib support. -it includes 2 modules: +it includes 2 modules but only uses app module: * app -- uses one shared lib and one static lib from $project/distribution/ * gen-libs -- generates one shared and one static lib, and copy them into $project/distribution -The debug library binaries are saved inside distribution folder. you could build your own with +For this demo purpose, you do not need to build libs: binaries are included in the project -- the +debug library binaries are saved inside distribution folder. If you want, you could build your own with gen-libs source, just follow comment in setting.gradle and app/build.gradle -- do it once, then comment them out again so you are not affected by lib building diff --git a/hello-libs/settings.gradle b/hello-libs/settings.gradle index 573abcb32..295304786 100644 --- a/hello-libs/settings.gradle +++ b/hello-libs/settings.gradle @@ -1,2 +1,11 @@ include ':app' +// The following is just for generating libs only. +// To use: +// uncomment out this line +// make sure uncomment out the one inside app/build.gradle to enable dependency +// build the app in Android Studio or command line +// Comment out this line and the one inside app/build.gradle again + +// include ':gen-libs' +