Disallow missing api source files for java_api_library module

The purpose of this change is to enable filegroups to be taken as inputs
for `java_api_library` module `api_files` property. However, since
android.MaybeExistentPathForSource() does not support this, it needs to
be replaced with android.PathForModuleSrc(), which checks for the files'
existence.

Bug: 283006953
Test: go test ./java
Change-Id: I8a7d7f200f900219cc17243194a4c26071329ee6
This commit is contained in:
Jihoon Kang
2023-05-17 00:23:38 +00:00
parent 7754be760a
commit 795319fadb
3 changed files with 31 additions and 5 deletions

View File

@@ -1651,7 +1651,7 @@ type JavaApiLibraryProperties struct {
// list of api.txt files relative to this directory that contribute to the
// API surface.
// This is a list of relative paths
Api_files []string
Api_files []string `android:"path"`
// List of flags to be passed to the javac compiler to generate jar file
Javacflags []string
@@ -1833,9 +1833,7 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
// Add the api_files inputs
for _, api := range al.properties.Api_files {
// Use MaybeExistentPathForSource since the api file might not exist during analysis.
// This will be provided by the orchestrator in the combined execution.
srcFiles = append(srcFiles, android.MaybeExistentPathForSource(ctx, ctx.ModuleDir(), api))
srcFiles = append(srcFiles, android.PathForModuleSrc(ctx, api))
}
if srcFiles == nil {

View File

@@ -2252,6 +2252,29 @@ func TestJavaApiLibraryDepApiSrcs(t *testing.T) {
android.AssertStringDoesContain(t, "Command expected to contain output files list text file flag", manifestCommand, "--out __SBOX_SANDBOX_DIR__/out/sources.txt")
}
func TestJavaApiLibraryFilegroupInput(t *testing.T) {
ctx, _ := testJavaWithFS(t, `
filegroup {
name: "default_current.txt",
srcs: ["current.txt"],
}
java_api_library {
name: "foo",
api_files: [":default_current.txt"],
}
`,
map[string][]byte{
"current.txt": nil,
})
m := ctx.ModuleForTests("foo", "android_common")
outputs := fmt.Sprint(m.AllOutputs())
if !strings.Contains(outputs, "foo/foo.jar") {
t.Errorf("Module output does not contain expected jar %s", "foo/foo.jar")
}
}
func TestTradefedOptions(t *testing.T) {
result := PrepareForTestWithJavaBuildComponents.RunTestWithBp(t, `
java_test_host {

View File

@@ -72,6 +72,11 @@ var prepareForTestWithFrameworkDeps = android.GroupFixturePreparers(
defaultJavaDir + "/framework/aidl": nil,
// Needed for various deps defined in GatherRequiredDepsForTest()
defaultJavaDir + "/a.java": nil,
defaultJavaDir + "/api/current.txt": nil,
defaultJavaDir + "/api/system-current.txt": nil,
defaultJavaDir + "/api/test-current.txt": nil,
defaultJavaDir + "/api/module-lib-current.txt": nil,
defaultJavaDir + "/api/system-server-current.txt": nil,
// Needed for R8 rules on apps
"build/make/core/proguard.flags": nil,