diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-02-16 00:22:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-16 00:22:29 +0000 |
| commit | f0c2de7466ead37a24f2cf34c760489cdb75b17c (patch) | |
| tree | 1eb7a9a31ae6037d0e70723c4b6409d30b353de9 /Android.bp | |
| parent | b3b80475ecf1a8001e0b57c4c7cf40bb64c674a9 (diff) | |
| parent | e99c73e203190a2cab86968a18f290c967461b59 (diff) | |
Merge "Fix framework and NetworkStack classes conflicts"
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -40,6 +40,7 @@ android_app { static_libs: [ "NetworkStackLib" ], + jarjar_rules: "jarjar-rules-shared.txt", manifest: "AndroidManifest.xml", required: ["NetworkStackPermissionStub"], }
\ No newline at end of file |