Revert "Port uses-shared library verification and dexpreopting to Soong"

This reverts commit b66d7b1c20.

Reason for revert: broke unbundled builds

Change-Id: I96ae287885107079de4a26e6b100ad8ed66961c0
This commit is contained in:
Colin Cross
2019-05-29 20:28:47 +00:00
parent b66d7b1c20
commit c032498336
12 changed files with 32 additions and 304 deletions

View File

@@ -1239,83 +1239,3 @@ func TestStl(t *testing.T) {
})
}
}
func TestUsesLibraries(t *testing.T) {
bp := `
java_sdk_library {
name: "foo",
srcs: ["a.java"],
api_packages: ["foo"],
}
java_sdk_library {
name: "bar",
srcs: ["a.java"],
api_packages: ["bar"],
}
android_app {
name: "app",
srcs: ["a.java"],
uses_libs: ["foo"],
optional_uses_libs: [
"bar",
"baz",
],
}
android_app_import {
name: "prebuilt",
apk: "prebuilts/apk/app.apk",
certificate: "platform",
uses_libs: ["foo"],
optional_uses_libs: [
"bar",
"baz",
],
}
`
config := testConfig(nil)
config.TestProductVariables.MissingUsesLibraries = []string{"baz"}
ctx := testAppContext(config, bp, nil)
run(t, ctx, config)
app := ctx.ModuleForTests("app", "android_common")
prebuilt := ctx.ModuleForTests("prebuilt", "android_common")
// Test that all libraries are verified
cmd := app.Rule("verify_uses_libraries").RuleParams.Command
if w := "--uses-library foo"; !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd)
}
if w := "--optional-uses-library bar --optional-uses-library baz"; !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd)
}
cmd = prebuilt.Rule("verify_uses_libraries").RuleParams.Command
if w := `uses_library_names="foo"`; !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd)
}
if w := `optional_uses_library_names="bar baz"`; !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd)
}
// Test that only present libraries are preopted
cmd = app.Rule("dexpreopt").RuleParams.Command
if w := `dex_preopt_target_libraries="/system/framework/foo.jar /system/framework/bar.jar"`; !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd)
}
cmd = prebuilt.Rule("dexpreopt").RuleParams.Command
if w := `dex_preopt_target_libraries="/system/framework/foo.jar /system/framework/bar.jar"`; !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd)
}
}