commit ce482dce028b135239fa1341a617bb54394388f5
author Paul Duffin <paulduffin@google.com> Mon Dec 09 19:58:17 2019 +0000
committer Paul Duffin <paulduffin@google.com> Wed Dec 11 08:13:07 2019 +0000
tree 9dc184e410f7dbe334c81230721f4f7ded11d062
parent 32fc94d09722bbe500f5f5ead00437ef954e6132

Exclude META-INF/ from repackaged source jar in snapshot

Prevents the META-INF/MANIFEST.MF file from the source jar from being
copied to the snapshot zip file.

Bug: 143678475
Test: m conscrypt-module-sdk
      manually check contents of generated zip

Change-Id: I6eca1435dfc25b562e49de46b049fa81cf8daf90

sdk/update.go

diff --git a/sdk/update.go b/sdk/update.go
index 7fad5c7..324f6c3 100644
--- a/sdk/update.go
+++ b/sdk/update.go
@@ -30,7 +30,7 @@
 var (
 	repackageZip = pctx.AndroidStaticRule("SnapshotRepackageZip",
 		blueprint.RuleParams{
-			Command: `${config.Zip2ZipCmd} -i $in -o $out "**/*:$destdir"`,
+			Command: `${config.Zip2ZipCmd} -i $in -o $out -x META-INF/**/* "**/*:$destdir"`,
 			CommandDeps: []string{
 				"${config.Zip2ZipCmd}",
 			},