| commit | 31656958d6c536a9716e7c2d544db3748d55da2a | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu May 24 16:11:20 2018 -0700 |
| committer | Colin Cross <ccross@android.com> | Wed Jul 11 19:46:38 2018 +0000 |
| tree | a740acba609c6cf7431c297fec080d8e7f172a5b | |
| parent | 5e48b1d183a8333528f529c7e677c4ab644f8caf [diff] [blame] |
Use manifest merger in Soong Move the manifest merger config to Soong, and use it to merge manifests of static dependencies of android_library and android_app modules. Bug: 110848854 Test: m checkbuild Change-Id: Ib89e1f1a52a8b76157e4e0348baf42800412df0d Merged-In: Ib89e1f1a52a8b76157e4e0348baf42800412df0d Merged-In: I5d055ce63b8371db500f8868fb73ab3604b8c24a
diff --git a/java/config/makevars.go b/java/config/makevars.go index d378877..275f496 100644 --- a/java/config/makevars.go +++ b/java/config/makevars.go
@@ -73,4 +73,8 @@ ctx.Strict("EXTRACT_JAR_PACKAGES", "${ExtractJarPackagesCmd}") ctx.Strict("MANIFEST_FIXER", "${ManifestFixerCmd}") + + ctx.Strict("ANDROID_MANIFEST_MERGER_DEPS", "${ManifestMergerJars}") + ctx.Strict("ANDROID_MANIFEST_MERGER", + "${JavaCmd} -classpath ${ManifestMergerClasspath} com.android.manifmerger.Merger") }