diff options
| author | Carlos Hernandez <chernand@google.com> | 2014-08-07 17:51:38 -0700 |
|---|---|---|
| committer | Carlos Hernandez <chernand@google.com> | 2014-08-11 20:38:34 +0000 |
| commit | 79397c21138f54fcff6ec067b44b847f1f7e0e98 (patch) | |
| tree | b2c33877af479b37f082fcbcaf50a24a49b69415 /jni/Application.mk | |
| parent | ad78e589f893a53da23bbdf41274d89dae656f54 (diff) | |
| download | ceres-solver-79397c21138f54fcff6ec067b44b847f1f7e0e98.tar.gz | |
Update ceres to the latest version in g3android-wear-5.0.0_r1android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-release
Please pay special attention to the changes in Android.mk.
They are the only real changes I had to make.
Bug: 16953678
Change-Id: I44a644358e779aaff99a2ea822387fe49ac26888
Diffstat (limited to 'jni/Application.mk')
| -rw-r--r-- | jni/Application.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/jni/Application.mk b/jni/Application.mk index 462823d..ec40293 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -33,6 +33,7 @@ APP_CPPFLAGS += -fno-exceptions APP_CPPFLAGS += -fno-rtti APP_OPTIM := release -# Don't use GNU libstdc++; instead use STLPort, which is free of GPL3 issues. -APP_STL := stlport_static +# Use libc++ from LLVM. It is a modern BSD licensed implementation of +# the standard C++ library. +APP_STL := c++_static APP_ABI := armeabi-v7a |