commit | 8b4db626b9a61a9e37f2019773492e0e3e1b1d47 | [log] [tgz] |
---|---|---|
author | gitbuildkicker <android-build@google.com> | Wed May 03 17:46:25 2017 -0700 |
committer | gitbuildkicker <android-build@google.com> | Wed May 03 17:46:25 2017 -0700 |
tree | e2a15f277b8dee2ca23e8fea91cda7bb5bab5efd | |
parent | abb9e9b35977779ea0774d51e925ba1c52bcd29d [diff] | |
parent | 1e8d185fe2d71a242633d3ec79092c72bd9f4178 [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