diff options
| author | 2024-03-22 18:16:57 +0000 | |
|---|---|---|
| committer | 2024-03-22 18:16:57 +0000 | |
| commit | 44841aada36a7098182fe719d352a4c6801e496e (patch) | |
| tree | 4b46fc870e843f482a2e88851cc0c6b82942e261 /java/android_manifest_test.go | |
| parent | c6c9c7354bb9c8b8e69f21141e79d682bbe51076 (diff) | |
Revert "Support transitive dependencies through android_libary_i..."
Revert submission 3008874
Reason for revert: b/330903911
Reverted changes: /q/submissionid:3008874
Change-Id: Ie056a7f90803ab2d8e39e07eddf6c9c68e41ff3d
Diffstat (limited to 'java/android_manifest_test.go')
| -rw-r--r-- | java/android_manifest_test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/android_manifest_test.go b/java/android_manifest_test.go index 7c9188462..5909b1e6a 100644 --- a/java/android_manifest_test.go +++ b/java/android_manifest_test.go @@ -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) } |