tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add apex_available to sysprop_library"

Browse source
This commit is contained in:
Paul Duffin 2020-03-31 09:06:58 +00:00 committed by Gerrit Code Review
commit 545d958508
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sysprop/sysprop_library.go
View file

@ -116,6 +116,7 @@ func syspropJavaGenFactory() android.Module {
type syspropLibrary struct {
android.ModuleBase
android.ApexModuleBase
properties syspropLibraryProperties
@ -314,6 +315,7 @@ func syspropLibraryFactory() android.Module {
&m.properties,
)
android.InitAndroidModule(m)
android.InitApexModule(m)
android.AddLoadHook(m, func(ctx android.LoadHookContext) { syspropLibraryHook(ctx, m) })
return m
}
@ -341,6 +343,7 @@ type ccLibraryProperties struct {
Recovery_available *bool
Vendor_available *bool
Host_supported *bool
Apex_available []string
}
type javaLibraryProperties struct {
@ -429,6 +432,7 @@ func syspropLibraryHook(ctx android.LoadHookContext, m *syspropLibrary) {
ccProps.Recovery_available = m.properties.Recovery_available
ccProps.Vendor_available = m.properties.Vendor_available
ccProps.Host_supported = m.properties.Host_supported
ccProps.Apex_available = m.ApexProperties.Apex_available
ctx.CreateModule(cc.LibraryFactory, &ccProps)
scope := "internal"

10
sysprop/sysprop_test.go
View file

@ -15,6 +15,8 @@
package sysprop
import (
"reflect"
"android/soong/android"
"android/soong/cc"
"android/soong/java"
@ -157,6 +159,7 @@ func TestSyspropLibrary(t *testing.T) {
ctx := test(t, `
sysprop_library {
name: "sysprop-platform",
apex_available: ["//apex_available:platform"],
srcs: ["android/sysprop/PlatformProperties.sysprop"],
api_packages: ["android.sysprop"],
property_owner: "Platform",
@ -305,7 +308,12 @@ func TestSyspropLibrary(t *testing.T) {
"android_arm64_armv8-a_shared",
"android_arm64_armv8-a_static",
} {
ctx.ModuleForTests("libsysprop-platform", variant)
library := ctx.ModuleForTests("libsysprop-platform", variant).Module().(*cc.Module)
expectedApexAvailableOnLibrary := []string{"//apex_available:platform"}
if !reflect.DeepEqual(library.ApexProperties.Apex_available, expectedApexAvailableOnLibrary) {
t.Errorf("apex available property on libsysprop-platform must be %#v, but was %#v.",
expectedApexAvailableOnLibrary, library.ApexProperties.Apex_available)
}
// core variant of vendor-owned sysprop_library is for product
ctx.ModuleForTests("libsysprop-vendor", variant)