StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add all compile deps to module_bp_java_deps.json

Browse Source 
`Dependencies` in module_bp_java_deps.json currently only contains the
`libs` and `static_libs` of the corresponding module. This is only a
subset of the dependencies which are required to compile the java
module. Most notably, the SDK deps (determined using `sdk_version`) are
missing.

This CL adds all the compile dependencies to the json file. Implementation
details:
1. Add a `compileDepNames` to java.Module in base.go. Almost all the
   module types in java package are composed with the java.Module
struct.
2. Populate this property in java.Module.collectDeps. This function is
   used by java.Module.compile to determine the classpath used for
compilation.
3. Return `compileDepNames` in java.Module.CompilerDeps.

Since `compileDepNames` is populated in `GenerateAndroidBuildActions`,
update existing unit tests that check for correctness of IDEInfo.Deps

Bug: 353811607
Test: m nothing --no-skip-soong-tests
Test: cat out/soong/module_bp_java_deps.json | jq '."DebuggingRestrictionController".dependencies'
[
  "android_system_stubs_current", <-- missing previously
  "core-lambda-stubs", <-- missing previously
  "core-public-stubs-system-modules", <-- missing previously
  "com.google.android.material_material",
  ...
  ...
]

Change-Id: I166c0eaf6e87ca7adc98bb4e21447cf82612d103
This commit is contained in:
Spandan Das
2024-07-18 23:14:13 +00:00
parent 8a66409462
commit 8aac993b94
3 changed files with 62 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
java/jdeps_test.go
View File

@@ -22,28 +22,46 @@ import (
)
func TestCollectJavaLibraryPropertiesAddLibsDeps(t *testing.T) {
expected := []string{"Foo", "Bar"}
module := LibraryFactory().(*Library)
module.properties.Libs = append(module.properties.Libs, expected...)
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)
if !reflect.DeepEqual(dpInfo.Deps, expected) {
t.Errorf("Library.IDEInfo() Deps = %v, want %v", dpInfo.Deps, expected)
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) {
expected := []string{"Foo", "Bar"}
module := LibraryFactory().(*Library)
module.properties.Static_libs = append(module.properties.Static_libs, expected...)
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)
if !reflect.DeepEqual(dpInfo.Deps, expected) {
t.Errorf("Library.IDEInfo() Deps = %v, want %v", dpInfo.Deps, expected)
for _, expected := range []string{"Foo", "Bar"} {
if !android.InList(expected, dpInfo.Deps) {
t.Errorf("Library.IDEInfo() Deps = %v, %v not found", dpInfo.Deps, expected)
}
}
}