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

Track transitive usage of aconfig flags and add LOCAL_ACONFIG_FILES to Android-<product>.mk

Browse Source 
Bug: 283910439
Test: m nothing (runs soong tests)
Change-Id: I59f9bef7b7c502565d531a5685c002a177e0a77c
This commit is contained in:
Joe Onorato
2023-07-16 13:20:33 -07:00
parent cfcd0a4960
commit 6fe59eb7f0
10 changed files with 234 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
aconfig/Android.bp
View File

@@ -28,6 +28,7 @@ bootstrap_go_package {
"aconfig_declarations_test.go",
"aconfig_values_test.go",
"aconfig_value_set_test.go",
"java_aconfig_library_test.go",
],
pluginFor: ["soong_build"],
}

7
aconfig/java_aconfig_library.go
View File

@@ -51,7 +51,7 @@ func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) DepsMutator(module *ja
}
}
func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) GenerateSourceJarBuildActions(ctx android.ModuleContext) android.Path {
func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) GenerateSourceJarBuildActions(module *java.GeneratedJavaLibraryModule, ctx android.ModuleContext) android.Path {
// Get the values that came from the global RELEASE_ACONFIG_VALUE_SETS flag
declarationsModules := ctx.GetDirectDepsWithTag(declarationsTag)
if len(declarationsModules) != 1 {
@@ -59,6 +59,7 @@ func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) GenerateSourceJarBuild
}
declarations := ctx.OtherModuleProvider(declarationsModules[0], declarationsProviderKey).(declarationsProviderData)
// Generate the action to build the srcjar
srcJarPath := android.PathForModuleGen(ctx, ctx.ModuleName()+".srcjar")
ctx.Build(pctx, android.BuildParams{
Rule: srcJarRule,
@@ -67,5 +68,9 @@ func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) GenerateSourceJarBuild
Description: "aconfig.srcjar",
})
// Tell the java module about the .aconfig files, so they can be propagated up the dependency chain.
// TODO: It would be nice to have that propagation code here instead of on java.Module and java.JavaInfo.
module.AddAconfigIntermediate(declarations.IntermediatePath)
return srcJarPath
}

154
aconfig/java_aconfig_library_test.go Normal file
View File

@@ -0,0 +1,154 @@
// Copyright 2023 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 aconfig
import (
"strings"
"testing"
"android/soong/android"
"android/soong/java"
)
// Note: These tests cover the code in the java package. It'd be ideal of that code could
// be in the aconfig package.
// With the bp parameter that defines a my_module, make sure it has the LOCAL_ACONFIG_FILES entries
func runJavaAndroidMkTest(t *testing.T, bp string) {
result := android.GroupFixturePreparers(
PrepareForTestWithAconfigBuildComponents,
java.PrepareForTestWithJavaDefaultModules).
ExtendWithErrorHandler(android.FixtureExpectsNoErrors).
RunTestWithBp(t, bp+`
aconfig_declarations {
name: "my_aconfig_declarations",
package: "com.example.package",
srcs: ["foo.aconfig"],
}
java_aconfig_library {
name: "my_java_aconfig_library",
aconfig_declarations: "my_aconfig_declarations",
}
`)
module := result.ModuleForTests("my_module", "android_common").Module()
entry := android.AndroidMkEntriesForTest(t, result.TestContext, module)[0]
makeVar := entry.EntryMap["LOCAL_ACONFIG_FILES"]
android.AssertIntEquals(t, "len(LOCAL_ACONFIG_FILES)", 1, len(makeVar))
if !strings.HasSuffix(makeVar[0], "intermediate.pb") {
t.Errorf("LOCAL_ACONFIG_FILES should end with /intermediates.pb, instead it is: %s", makeVar[0])
}
}
func TestAndroidMkJavaLibrary(t *testing.T) {
bp := `
java_library {
name: "my_module",
srcs: [
"src/foo.java",
],
static_libs: [
"my_java_aconfig_library",
],
platform_apis: true,
}
`
runJavaAndroidMkTest(t, bp)
}
func TestAndroidMkAndroidApp(t *testing.T) {
bp := `
android_app {
name: "my_module",
srcs: [
"src/foo.java",
],
static_libs: [
"my_java_aconfig_library",
],
platform_apis: true,
}
`
runJavaAndroidMkTest(t, bp)
}
func TestAndroidMkBinary(t *testing.T) {
bp := `
java_binary {
name: "my_module",
srcs: [
"src/foo.java",
],
static_libs: [
"my_java_aconfig_library",
],
platform_apis: true,
main_class: "foo",
}
`
runJavaAndroidMkTest(t, bp)
}
func TestAndroidMkAndroidLibrary(t *testing.T) {
bp := `
android_library {
name: "my_module",
srcs: [
"src/foo.java",
],
static_libs: [
"my_java_aconfig_library",
],
platform_apis: true,
}
`
runJavaAndroidMkTest(t, bp)
}
func TestAndroidMkBinaryThatLinksAgainstAar(t *testing.T) {
// Tests AndroidLibrary's propagation of flags through JavaInfo
bp := `
android_library {
name: "some_library",
srcs: [
"src/foo.java",
],
static_libs: [
"my_java_aconfig_library",
],
platform_apis: true,
}
java_binary {
name: "my_module",
srcs: [
"src/bar.java",
],
static_libs: [
"some_library",
],
platform_apis: true,
main_class: "foo",
}
`
runJavaAndroidMkTest(t, bp)
}