diff options
| author | Christopher Ferris <cferris@google.com> | 2016-04-19 14:27:18 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2016-04-19 14:32:13 -0700 |
| commit | 0e2da1808148184ab2a173dea6faed55b51489fe (patch) | |
| tree | 1c01879cd18b31be2afd7fc92b6ca2448bcb6497 /samples/ApiDemos/Android.mk | |
| parent | 7f00068526bd49387ab5efa1ab9fdc4bcddb288a (diff) | |
| download | android_development-0e2da1808148184ab2a173dea6faed55b51489fe.tar.gz android_development-0e2da1808148184ab2a173dea6faed55b51489fe.tar.bz2 android_development-0e2da1808148184ab2a173dea6faed55b51489fe.zip | |
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
Diffstat (limited to 'samples/ApiDemos/Android.mk')
| -rw-r--r-- | samples/ApiDemos/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/samples/ApiDemos/Android.mk b/samples/ApiDemos/Android.mk index 66100b168..fedf65a10 100644 --- a/samples/ApiDemos/Android.mk +++ b/samples/ApiDemos/Android.mk @@ -18,6 +18,8 @@ LOCAL_PACKAGE_NAME := ApiDemos LOCAL_SDK_VERSION := current +LOCAL_DEX_PREOPT := false + include $(BUILD_PACKAGE) # Use the folloing include to make our test apk. |