diff options
| author | Colin Cross <ccross@android.com> | 2017-09-12 22:50:46 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-09-20 13:20:45 -0700 |
| commit | 635acc9446c3a8c88b6599d30312c6399419f2b8 (patch) | |
| tree | f46d048da7c2ac22272bcfb8f792a3db56997b80 /jar/Android.bp | |
| parent | 6eebec7414cb5940725c91bc03261c7de838b9e0 (diff) | |
| download | build_soong-635acc9446c3a8c88b6599d30312c6399419f2b8.tar.gz build_soong-635acc9446c3a8c88b6599d30312c6399419f2b8.tar.bz2 build_soong-635acc9446c3a8c88b6599d30312c6399419f2b8.zip | |
Rearrange manifest file handling in merge_zips and soong_zip
Jar always puts default MANIFEST.MF files in if none was specified.
Copying that behavior in soong_zip causes problems with merge_zips,
because it ends up taking the default manifest from the classes.jar
instead of the user's manifest from res.jar. We don't want the
user's manifest in the classes.jar, otherwise a change to the
manifest will cause all the class files to rebuild. Instead,
move the manifest insertion to the final merge_zips stage.
Test: m -j checkbuild
Change-Id: Id6376961dbaf743c2fb92843f9bdf2e44b963be0
Diffstat (limited to 'jar/Android.bp')
| -rw-r--r-- | jar/Android.bp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/jar/Android.bp b/jar/Android.bp index 23ad5368..6c2e60e4 100644 --- a/jar/Android.bp +++ b/jar/Android.bp @@ -18,5 +18,8 @@ bootstrap_go_package { srcs: [ "jar.go", ], + deps: [ + "android-archive-zip", + ], } |