java modules that link against a versioned sdk (sdk_version: <num>) get the appropriate stub jar on its classpath, but the dependency is not registered in its build graph. This CL registers this dependency for module_bp_java_deps.json. Ideally, we should move this to `decodeSdkDep` so that this dependendency becomes known to other tools that analyze soong's module graph (e.g. soongdbg) Test: go test ./java Bug: 358608607 Bug: 356572093 Change-Id: Iab6efe7826d18dedfadbe4d34d78e7eb2888bd8d
126 lines
3.6 KiB
Go
126 lines
3.6 KiB
Go
// Copyright 2018 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 (
|
|
"reflect"
|
|
"testing"
|
|
|
|
"android/soong/android"
|
|
)
|
|
|
|
func TestCollectJavaLibraryPropertiesAddLibsDeps(t *testing.T) {
|
|
ctx, _ := testJava(t,
|
|
`
|
|
java_library {name: "Foo"}
|
|
java_library {name: "Bar"}
|
|
java_library {
|
|
name: "javalib",
|
|
libs: ["Foo", "Bar"],
|
|
}
|
|
`)
|
|
module := ctx.ModuleForTests("javalib", "android_common").Module().(*Library)
|
|
dpInfo := &android.IdeInfo{}
|
|
|
|
module.IDEInfo(dpInfo)
|
|
|
|
for _, expected := range []string{"Foo", "Bar"} {
|
|
if !android.InList(expected, dpInfo.Deps) {
|
|
t.Errorf("Library.IDEInfo() Deps = %v, %v not found", dpInfo.Deps, expected)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestCollectJavaLibraryPropertiesAddStaticLibsDeps(t *testing.T) {
|
|
ctx, _ := testJava(t,
|
|
`
|
|
java_library {name: "Foo"}
|
|
java_library {name: "Bar"}
|
|
java_library {
|
|
name: "javalib",
|
|
static_libs: ["Foo", "Bar"],
|
|
}
|
|
`)
|
|
module := ctx.ModuleForTests("javalib", "android_common").Module().(*Library)
|
|
dpInfo := &android.IdeInfo{}
|
|
|
|
module.IDEInfo(dpInfo)
|
|
|
|
for _, expected := range []string{"Foo", "Bar"} {
|
|
if !android.InList(expected, dpInfo.Deps) {
|
|
t.Errorf("Library.IDEInfo() Deps = %v, %v not found", dpInfo.Deps, expected)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestCollectJavaLibraryPropertiesAddScrs(t *testing.T) {
|
|
expected := []string{"Foo", "Bar"}
|
|
module := LibraryFactory().(*Library)
|
|
module.expandIDEInfoCompiledSrcs = append(module.expandIDEInfoCompiledSrcs, expected...)
|
|
dpInfo := &android.IdeInfo{}
|
|
|
|
module.IDEInfo(dpInfo)
|
|
|
|
if !reflect.DeepEqual(dpInfo.Srcs, expected) {
|
|
t.Errorf("Library.IDEInfo() Srcs = %v, want %v", dpInfo.Srcs, expected)
|
|
}
|
|
}
|
|
|
|
func TestCollectJavaLibraryPropertiesAddAidlIncludeDirs(t *testing.T) {
|
|
expected := []string{"Foo", "Bar"}
|
|
module := LibraryFactory().(*Library)
|
|
module.deviceProperties.Aidl.Include_dirs = append(module.deviceProperties.Aidl.Include_dirs, expected...)
|
|
dpInfo := &android.IdeInfo{}
|
|
|
|
module.IDEInfo(dpInfo)
|
|
|
|
if !reflect.DeepEqual(dpInfo.Aidl_include_dirs, expected) {
|
|
t.Errorf("Library.IDEInfo() Aidl_include_dirs = %v, want %v", dpInfo.Aidl_include_dirs, expected)
|
|
}
|
|
}
|
|
|
|
func TestCollectJavaLibraryPropertiesAddJarjarRules(t *testing.T) {
|
|
expected := "Jarjar_rules.txt"
|
|
module := LibraryFactory().(*Library)
|
|
module.expandJarjarRules = android.PathForTesting(expected)
|
|
dpInfo := &android.IdeInfo{}
|
|
|
|
module.IDEInfo(dpInfo)
|
|
|
|
if dpInfo.Jarjar_rules[0] != expected {
|
|
t.Errorf("Library.IDEInfo() Jarjar_rules = %v, want %v", dpInfo.Jarjar_rules[0], expected)
|
|
}
|
|
}
|
|
|
|
func TestCollectJavaLibraryLinkingAgainstVersionedSdk(t *testing.T) {
|
|
ctx := android.GroupFixturePreparers(
|
|
prepareForJavaTest,
|
|
FixtureWithPrebuiltApis(map[string][]string{
|
|
"29": {},
|
|
})).RunTestWithBp(t,
|
|
`
|
|
java_library {
|
|
name: "javalib",
|
|
srcs: ["foo.java"],
|
|
sdk_version: "29",
|
|
}
|
|
`)
|
|
module := ctx.ModuleForTests("javalib", "android_common").Module().(*Library)
|
|
dpInfo := &android.IdeInfo{}
|
|
|
|
module.IDEInfo(dpInfo)
|
|
android.AssertStringListContains(t, "IdeInfo.Deps should contain versioned sdk module", dpInfo.Deps, "sdk_public_29_android")
|
|
}
|