commit ed4ac244cdb2e213118b7aba628d4f7d26c88636
author Christopher Ferris <cferris@google.com> Tue Apr 19 14:27:18 2016 -0700
committer Christopher Ferris <cferris@google.com> Tue Apr 19 14:32:13 2016 -0700
tree 95d49e4cd4f3778f07a8e28d18826c3f05183954
parent 4a77d8916b4ec1deadfd3bee561bbda60bfd578a

Fix up the makefiles and some samples.

Add LOCAL_DEX_PREOPT := false to force the samples to build actual apks.

In addition, fix a couple of other small issues:

- TtsEngine didn't have the api level set properly.
- SimpleJNI used a non-ndk library and was using libc++.

Change-Id: I1fd7c187956eed4620049bb746f4d62babcd648a

samples/Support4Demos/Android.mk

diff --git a/samples/Support4Demos/Android.mk b/samples/Support4Demos/Android.mk
index 1a760ad..afca76e 100644
--- a/samples/Support4Demos/Android.mk
+++ b/samples/Support4Demos/Android.mk
@@ -12,6 +12,8 @@
 
 LOCAL_SDK_VERSION := current
 
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
 
 # Use the following include to make our test apk.