| commit | 6160c37d910e49566629962153f455a0847f9c02 | [log] [tgz] |
|---|---|---|
| author | gitbuildkicker <android-build@google.com> | Fri May 05 19:29:08 2017 -0700 |
| committer | gitbuildkicker <android-build@google.com> | Fri May 05 19:29:08 2017 -0700 |
| tree | 27fffb27277b8071289b8607280b49121e663748 | |
| parent | d55f192df1141849d908bab40f0d1b3d50d1b5e4 [diff] | |
| parent | 7cc916f31d4b6606b7502f7146c6fc8346014e5d [diff] |
merge in oc-release history after reset to oc-dev
diff --git a/Android.mk b/Android.mk index 11c69b1..2fb03c1 100644 --- a/Android.mk +++ b/Android.mk
@@ -26,7 +26,10 @@ LOCAL_CERTIFICATE := shared LOCAL_STATIC_JAVA_LIBRARIES := \ - android-common android-support-v4 jsr305 + android-common jsr305 +LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4 + +LOCAL_USE_AAPT2 := true # Include all the resources regardless of system supported locales LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true