| commit | 0dbc44b92e64728a73df1572508b4551e7097da3 | [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 | e2a15f277b8dee2ca23e8fea91cda7bb5bab5efd | |
| parent | 491f6879e70353ad8c75bf878ff67bf41c8287b5 [diff] | |
| parent | 9902e5b5dfdccaa9b35a00350aad0b8172592662 [diff] |
merge in oc-release history after reset to oc-dev
diff --git a/Android.mk b/Android.mk index e8053cf..18470d5 100644 --- a/Android.mk +++ b/Android.mk
@@ -30,8 +30,11 @@ LOCAL_PRIVILEGED_MODULE := true -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 \ - jsr305 +LOCAL_STATIC_JAVA_LIBRARIES += jsr305 + +LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4 + +LOCAL_USE_AAPT2 := true LOCAL_PROGUARD_ENABLED := disabled