Add test for manifest merger
Add a test for the manifest merger command line that would have prevented b/291252863. Bug: 291252863 Test: TestManifestMerger Change-Id: I8c025efe7ccb06ad97b405e2927a4df07f9d3f27
This commit is contained in:
parent
e61a0817f6
commit
02bccdf37c
2 changed files with 104 additions and 0 deletions
|
@ -80,6 +80,7 @@ bootstrap_go_package {
|
|||
],
|
||||
testSrcs: [
|
||||
"aar_test.go",
|
||||
"android_manifest_test.go",
|
||||
"androidmk_test.go",
|
||||
"app_import_test.go",
|
||||
"app_set_test.go",
|
||||
|
|
103
java/android_manifest_test.go
Normal file
103
java/android_manifest_test.go
Normal file
|
@ -0,0 +1,103 @@
|
|||
// Copyright 2023 Google Inc. All rights reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package java
|
||||
|
||||
import (
|
||||
"android/soong/android"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestManifestMerger(t *testing.T) {
|
||||
bp := `
|
||||
android_app {
|
||||
name: "app",
|
||||
sdk_version: "current",
|
||||
srcs: ["app/app.java"],
|
||||
resource_dirs: ["app/res"],
|
||||
manifest: "app/AndroidManifest.xml",
|
||||
additional_manifests: ["app/AndroidManifest2.xml"],
|
||||
static_libs: ["direct", "direct_import"],
|
||||
}
|
||||
|
||||
android_library {
|
||||
name: "direct",
|
||||
sdk_version: "current",
|
||||
srcs: ["direct/direct.java"],
|
||||
resource_dirs: ["direct/res"],
|
||||
manifest: "direct/AndroidManifest.xml",
|
||||
additional_manifests: ["direct/AndroidManifest2.xml"],
|
||||
static_libs: ["transitive", "transitive_import"],
|
||||
}
|
||||
|
||||
android_library {
|
||||
name: "transitive",
|
||||
sdk_version: "current",
|
||||
srcs: ["transitive/transitive.java"],
|
||||
resource_dirs: ["transitive/res"],
|
||||
manifest: "transitive/AndroidManifest.xml",
|
||||
additional_manifests: ["transitive/AndroidManifest2.xml"],
|
||||
}
|
||||
|
||||
android_library_import {
|
||||
name: "direct_import",
|
||||
sdk_version: "current",
|
||||
aars: ["direct_import.aar"],
|
||||
static_libs: ["direct_import_dep"],
|
||||
}
|
||||
|
||||
android_library_import {
|
||||
name: "direct_import_dep",
|
||||
sdk_version: "current",
|
||||
aars: ["direct_import_dep.aar"],
|
||||
}
|
||||
|
||||
android_library_import {
|
||||
name: "transitive_import",
|
||||
sdk_version: "current",
|
||||
aars: ["transitive_import.aar"],
|
||||
static_libs: ["transitive_import_dep"],
|
||||
}
|
||||
|
||||
android_library_import {
|
||||
name: "transitive_import_dep",
|
||||
sdk_version: "current",
|
||||
aars: ["transitive_import_dep.aar"],
|
||||
}
|
||||
`
|
||||
|
||||
result := android.GroupFixturePreparers(
|
||||
PrepareForTestWithJavaDefaultModules,
|
||||
PrepareForTestWithOverlayBuildComponents,
|
||||
).RunTestWithBp(t, bp)
|
||||
|
||||
manifestMergerRule := result.ModuleForTests("app", "android_common").Rule("manifestMerger")
|
||||
android.AssertPathRelativeToTopEquals(t, "main manifest",
|
||||
"out/soong/.intermediates/app/android_common/manifest_fixer/AndroidManifest.xml",
|
||||
manifestMergerRule.Input)
|
||||
android.AssertPathsRelativeToTopEquals(t, "lib manifests",
|
||||
[]string{
|
||||
"app/AndroidManifest2.xml",
|
||||
"out/soong/.intermediates/direct/android_common/manifest_fixer/AndroidManifest.xml",
|
||||
"direct/AndroidManifest2.xml",
|
||||
"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/direct_import/android_common/aar/AndroidManifest.xml",
|
||||
// TODO(b/288358614): Soong has historically not merged manifests from dependencies of
|
||||
// android_library_import modules.
|
||||
|
||||
},
|
||||
manifestMergerRule.Implicits)
|
||||
}
|
Loading…
Reference in a new issue