StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Support transitive dependencies through android_libary_i..."

Browse Source 
Revert submission 3008874

Reason for revert: b/330903911
Reverted changes: /q/submissionid:3008874

Change-Id: Ie056a7f90803ab2d8e39e07eddf6c9c68e41ff3d
This commit is contained in:
Colin Cross
2024-03-22 18:16:57 +00:00
parent c6c9c7354b
commit 44841aada3
4 changed files with 52 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/android_manifest_test.go
View File

@@ -92,9 +92,10 @@ func TestManifestMerger(t *testing.T) {
"out/soong/.intermediates/transitive/android_common/manifest_fixer/AndroidManifest.xml",
"transitive/AndroidManifest2.xml",
"out/soong/.intermediates/transitive_import/android_common/aar/AndroidManifest.xml",
"out/soong/.intermediates/transitive_import_dep/android_common/aar/AndroidManifest.xml",
"out/soong/.intermediates/direct_import/android_common/aar/AndroidManifest.xml",
"out/soong/.intermediates/direct_import_dep/android_common/aar/AndroidManifest.xml",
// TODO(b/288358614): Soong has historically not merged manifests from dependencies of
// android_library_import modules.
},
manifestMergerRule.Implicits)
}