| commit | 2c6a1afa2b1548abd6ced0664d110bb9f6fe8b26 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Jan 13 16:56:46 2017 -0800 |
| committer | Colin Cross <ccross@android.com> | Mon Feb 13 15:42:37 2017 -0800 |
| tree | 8b3e46b4f7edb15dd88958eb53e339bed4ac33eb | |
| parent | d4da840894402abef7298723da4456d1fa9c8768 [diff] [blame] |
Make separate copy of protobuf libraries Avoids proguard error on collision between telephony and framework copies. Test: m -j checkbuild Change-Id: I1208ba475e82204f19c53787cfd80b3ed881b183
diff --git a/jarjar-rules.txt b/jarjar-rules.txt index 50220b4..958e2bb 100644 --- a/jarjar-rules.txt +++ b/jarjar-rules.txt
@@ -1,2 +1,2 @@ -rule com.google.protobuf.nano.** com.android.framework.protobuf.nano.@1 +rule com.google.protobuf.nano.** com.android.internal.telephony.protobuf.nano.@1