| 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/Android.bp b/Android.bp index 2daa958..26aeac2 100644 --- a/Android.bp +++ b/Android.bp
@@ -221,6 +221,7 @@ srcs: [ "java/aapt2.go", "java/aar.go", + "java/android_manifest.go", "java/android_resources.go", "java/androidmk.go", "java/app_builder.go",