diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-07 19:03:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-07 19:03:15 (GMT) |
| commit | 5d8da06d60138c18eb68fab01b9b6e736ecd4914 (patch) | |
| tree | 370cd99fbb702b0a7137f3387fbbeb8b68ebead0 /Tests/RunCMake/AndroidMK/expectedInstallAndroidMK.txt | |
| parent | a033f8671272c382ba55c23f1269439cc4db4a97 (diff) | |
| parent | dda6775c940129d2a38fecd6cf6273f7d97ccca0 (diff) | |
| download | CMake-5d8da06d60138c18eb68fab01b9b6e736ecd4914.zip CMake-5d8da06d60138c18eb68fab01b9b6e736ecd4914.tar.gz CMake-5d8da06d60138c18eb68fab01b9b6e736ecd4914.tar.bz2 | |
Merge branch 'android-export-has-cpp' into release
Diffstat (limited to 'Tests/RunCMake/AndroidMK/expectedInstallAndroidMK.txt')
| -rw-r--r-- | Tests/RunCMake/AndroidMK/expectedInstallAndroidMK.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Tests/RunCMake/AndroidMK/expectedInstallAndroidMK.txt b/Tests/RunCMake/AndroidMK/expectedInstallAndroidMK.txt index 1bdb308..3515fb9 100644 --- a/Tests/RunCMake/AndroidMK/expectedInstallAndroidMK.txt +++ b/Tests/RunCMake/AndroidMK/expectedInstallAndroidMK.txt @@ -9,11 +9,13 @@ include.*PREBUILT_STATIC_LIBRARY.* include.*CLEAR_VARS. LOCAL_MODULE.*dog LOCAL_SRC_FILES.*_IMPORT_PREFIX./lib.*dog.* +LOCAL_HAS_CPP := true include.*PREBUILT_STATIC_LIBRARY.* include.*CLEAR_VARS.* LOCAL_MODULE.*car LOCAL_SRC_FILES.*_IMPORT_PREFIX./lib.*car.* +LOCAL_HAS_CPP := true include.*PREBUILT_STATIC_LIBRARY.* include.*CLEAR_VARS.* @@ -22,4 +24,5 @@ LOCAL_SRC_FILES.*_IMPORT_PREFIX\)/lib.*foo.* LOCAL_CPP_FEATURES.*rtti exceptions LOCAL_STATIC_LIBRARIES.*car bar dog LOCAL_EXPORT_LDLIBS := -lm +LOCAL_HAS_CPP := true include.*PREBUILT_STATIC_LIBRARY.* |