9ff8f4c81b
When adding a dependencies, if the variants don't match, but the dependency only has 1 variant anyways, soong will always use that variant. This makes it hard to add new variants to soong, because the 1-variant fallback stops being used and you start getting missing variant errors. Make changes to bp files such that all dependencies correctly specify the variant to use. Bug: 372091092 Flag: EXEMPT refactor Test: m nothing Change-Id: I8d4f59044f268088b44357d27322abbdcdc3001c
55 lines
1.9 KiB
Text
55 lines
1.9 KiB
Text
//
|
|
// Copyright (C) 2019 The Android Open Source Project
|
|
//
|
|
// 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 {
|
|
default_team: "trendy_team_fwk_core_networking",
|
|
// See: http://go/android-license-faq
|
|
default_applicable_licenses: ["Android-Apache-2.0"],
|
|
}
|
|
|
|
// FrameworksNetDeflakeTest depends on FrameworksNetTests so it should be disabled
|
|
// if FrameworksNetTests is disabled.
|
|
enable_frameworks_net_deflake_test = true
|
|
// Placeholder
|
|
// This is a placeholder comment to minimize merge conflicts, as enable_frameworks_net_deflake_test
|
|
// may have different values depending on the branch
|
|
// Placeholder
|
|
|
|
java_test_host {
|
|
name: "FrameworksNetDeflakeTest",
|
|
enabled: enable_frameworks_net_deflake_test,
|
|
srcs: ["src/**/*.kt"],
|
|
libs: [
|
|
"junit",
|
|
"tradefed",
|
|
],
|
|
static_libs: [
|
|
"kotlin-test",
|
|
"net-host-tests-utils",
|
|
],
|
|
device_common_data: [":FrameworksNetTests"],
|
|
test_suites: ["device-tests"],
|
|
// It will get build error if just set enabled to true. It fails with "windows_common"
|
|
// depends on some disabled modules that are used by this test and it looks like set
|
|
// enable_frameworks_net_deflake_test to true also enables "windows" variant. Thus,
|
|
// disable this on target windows.
|
|
// TODO: Remove this when b/201754360 is fixed.
|
|
target: {
|
|
windows: {
|
|
enabled: false,
|
|
},
|
|
},
|
|
}
|