mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 11:36:00 +00:00
Merge "compatibility matrices: move to soong" am: 9cfddb6282
am: 9f897faa8b
Change-Id: I3341942ce2dc8db558efa84b38e60313bc8e54b2
This commit is contained in:
Yifan Hong
android-build-merger
77
compatibility_matrices/Android.bp
Normal file
77
compatibility_matrices/Android.bp
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
// Copyright (C) 2018 The Android Open Source Project
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
vintf_compatibility_matrix {
|
||||||
|
name: "framework_compatibility_matrix.legacy.xml",
|
||||||
|
stem: "compatibility_matrix.legacy.xml",
|
||||||
|
srcs: [
|
||||||
|
"compatibility_matrix.legacy.xml",
|
||||||
|
],
|
||||||
|
kernel_configs: [
|
||||||
|
// legacy uses O kernel requirements
|
||||||
|
"kernel_config_o_3.18",
|
||||||
|
"kernel_config_o_4.4",
|
||||||
|
"kernel_config_o_4.9",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
vintf_compatibility_matrix {
|
||||||
|
name: "framework_compatibility_matrix.1.xml",
|
||||||
|
stem: "compatibility_matrix.1.xml",
|
||||||
|
srcs: [
|
||||||
|
"compatibility_matrix.1.xml",
|
||||||
|
],
|
||||||
|
kernel_configs: [
|
||||||
|
"kernel_config_o_3.18",
|
||||||
|
"kernel_config_o_4.4",
|
||||||
|
"kernel_config_o_4.9",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
vintf_compatibility_matrix {
|
||||||
|
name: "framework_compatibility_matrix.2.xml",
|
||||||
|
stem: "compatibility_matrix.2.xml",
|
||||||
|
srcs: [
|
||||||
|
"compatibility_matrix.2.xml",
|
||||||
|
],
|
||||||
|
kernel_configs: [
|
||||||
|
"kernel_config_o_mr1_3.18",
|
||||||
|
"kernel_config_o_mr1_4.4",
|
||||||
|
"kernel_config_o_mr1_4.9",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
vintf_compatibility_matrix {
|
||||||
|
name: "framework_compatibility_matrix.3.xml",
|
||||||
|
stem: "compatibility_matrix.3.xml",
|
||||||
|
srcs: [
|
||||||
|
"compatibility_matrix.3.xml",
|
||||||
|
],
|
||||||
|
kernel_configs: [
|
||||||
|
"kernel_config_p_4.4",
|
||||||
|
"kernel_config_p_4.9",
|
||||||
|
"kernel_config_p_4.14",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
vintf_compatibility_matrix {
|
||||||
|
name: "framework_compatibility_matrix.current.xml",
|
||||||
|
stem: "compatibility_matrix.current.xml",
|
||||||
|
srcs: [
|
||||||
|
"compatibility_matrix.current.xml",
|
||||||
|
],
|
||||||
|
kernel_configs: [
|
||||||
|
"kernel_config_current_4.4",
|
||||||
|
"kernel_config_current_4.9",
|
||||||
|
"kernel_config_current_4.14",
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -20,70 +20,6 @@ BUILD_FRAMEWORK_COMPATIBILITY_MATRIX := $(LOCAL_PATH)/compatibility_matrix.mk
|
|||||||
|
|
||||||
my_kernel_config_data := kernel/configs
|
my_kernel_config_data := kernel/configs
|
||||||
|
|
||||||
# Install all compatibility_matrix.*.xml to /system/etc/vintf
|
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
|
||||||
include $(LOCAL_PATH)/clear_vars.mk
|
|
||||||
LOCAL_MODULE := framework_compatibility_matrix.legacy.xml
|
|
||||||
LOCAL_MODULE_STEM := compatibility_matrix.legacy.xml
|
|
||||||
LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)
|
|
||||||
LOCAL_KERNEL_CONFIG_DATA_PATHS := \
|
|
||||||
3.18.0:$(my_kernel_config_data)/o/android-3.18 \
|
|
||||||
4.4.0:$(my_kernel_config_data)/o/android-4.4 \
|
|
||||||
4.9.0:$(my_kernel_config_data)/o/android-4.9 \
|
|
||||||
|
|
||||||
include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)
|
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
|
||||||
include $(LOCAL_PATH)/clear_vars.mk
|
|
||||||
LOCAL_MODULE := framework_compatibility_matrix.1.xml
|
|
||||||
LOCAL_MODULE_STEM := compatibility_matrix.1.xml
|
|
||||||
LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)
|
|
||||||
LOCAL_KERNEL_CONFIG_DATA_PATHS := \
|
|
||||||
3.18.0:$(my_kernel_config_data)/o/android-3.18 \
|
|
||||||
4.4.0:$(my_kernel_config_data)/o/android-4.4 \
|
|
||||||
4.9.0:$(my_kernel_config_data)/o/android-4.9 \
|
|
||||||
|
|
||||||
include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)
|
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
|
||||||
include $(LOCAL_PATH)/clear_vars.mk
|
|
||||||
LOCAL_MODULE := framework_compatibility_matrix.2.xml
|
|
||||||
LOCAL_MODULE_STEM := compatibility_matrix.2.xml
|
|
||||||
LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)
|
|
||||||
LOCAL_KERNEL_CONFIG_DATA_PATHS := \
|
|
||||||
3.18.0:$(my_kernel_config_data)/o-mr1/android-3.18 \
|
|
||||||
4.4.0:$(my_kernel_config_data)/o-mr1/android-4.4 \
|
|
||||||
4.9.0:$(my_kernel_config_data)/o-mr1/android-4.9 \
|
|
||||||
|
|
||||||
include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)
|
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
|
||||||
include $(LOCAL_PATH)/clear_vars.mk
|
|
||||||
LOCAL_MODULE := framework_compatibility_matrix.3.xml
|
|
||||||
LOCAL_MODULE_STEM := compatibility_matrix.3.xml
|
|
||||||
LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)
|
|
||||||
LOCAL_KERNEL_CONFIG_DATA_PATHS := \
|
|
||||||
4.4.107:$(my_kernel_config_data)/p/android-4.4 \
|
|
||||||
4.9.84:$(my_kernel_config_data)/p/android-4.9 \
|
|
||||||
4.14.42:$(my_kernel_config_data)/p/android-4.14 \
|
|
||||||
|
|
||||||
include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)
|
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
|
||||||
include $(LOCAL_PATH)/clear_vars.mk
|
|
||||||
LOCAL_MODULE := framework_compatibility_matrix.current.xml
|
|
||||||
LOCAL_MODULE_STEM := compatibility_matrix.current.xml
|
|
||||||
LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)
|
|
||||||
LOCAL_KERNEL_CONFIG_DATA_PATHS := \
|
|
||||||
4.4.0:$(my_kernel_config_data)/android-4.4 \
|
|
||||||
4.9.0:$(my_kernel_config_data)/android-4.9 \
|
|
||||||
4.14.0:$(my_kernel_config_data)/android-4.14 \
|
|
||||||
|
|
||||||
include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)
|
|
||||||
|
|
||||||
my_kernel_config_data :=
|
|
||||||
|
|
||||||
# Framework Compatibility Matrix (common to all FCM versions)
|
# Framework Compatibility Matrix (common to all FCM versions)
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
|||||||
29
compatibility_matrices/build/Android.bp
Normal file
29
compatibility_matrices/build/Android.bp
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
// Copyright (C) 2018 The Android Open Source Project
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
bootstrap_go_package {
|
||||||
|
name: "vintf-compatibility-matrix-soong-rules",
|
||||||
|
pkgPath: "android/soong/vintf-compatibility-matrix",
|
||||||
|
deps: [
|
||||||
|
"blueprint",
|
||||||
|
"blueprint-proptools",
|
||||||
|
"kernel-config-soong-rules",
|
||||||
|
"soong",
|
||||||
|
"soong-android",
|
||||||
|
],
|
||||||
|
srcs: [
|
||||||
|
"vintf_compatibility_matrix.go",
|
||||||
|
],
|
||||||
|
pluginFor: ["soong_build"],
|
||||||
|
}
|
||||||
132
compatibility_matrices/build/vintf_compatibility_matrix.go
Normal file
132
compatibility_matrices/build/vintf_compatibility_matrix.go
Normal file
@@ -0,0 +1,132 @@
|
|||||||
|
// Copyright (C) 2018 The Android Open Source Project
|
||||||
|
//
|
||||||
|
// 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 vintf
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/google/blueprint"
|
||||||
|
"github.com/google/blueprint/proptools"
|
||||||
|
|
||||||
|
"android/soong/android"
|
||||||
|
"android/soong/kernel/configs"
|
||||||
|
)
|
||||||
|
|
||||||
|
type dependencyTag struct {
|
||||||
|
blueprint.BaseDependencyTag
|
||||||
|
name string
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
pctx = android.NewPackageContext("android/vintf")
|
||||||
|
|
||||||
|
assembleVintfRule = pctx.AndroidStaticRule("assemble_vintf", blueprint.RuleParams{
|
||||||
|
Command: `${assembleVintfCmd} -i ${inputs} -o ${out}`,
|
||||||
|
CommandDeps: []string{"${assembleVintfCmd}"},
|
||||||
|
Description: "assemble_vintf -i ${inputs}",
|
||||||
|
}, "inputs")
|
||||||
|
|
||||||
|
kernelConfigTag = dependencyTag{name: "kernel-config"}
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
relpath = "vintf"
|
||||||
|
)
|
||||||
|
|
||||||
|
type vintfCompatibilityMatrixProperties struct {
|
||||||
|
// set the name of the output
|
||||||
|
Stem *string
|
||||||
|
|
||||||
|
// list of source compatibility matrix XML files
|
||||||
|
Srcs []string
|
||||||
|
|
||||||
|
// list of kernel_config modules to be combined to final output
|
||||||
|
Kernel_configs []string
|
||||||
|
}
|
||||||
|
|
||||||
|
type vintfCompatibilityMatrixRule struct {
|
||||||
|
android.ModuleBase
|
||||||
|
properties vintfCompatibilityMatrixProperties
|
||||||
|
|
||||||
|
genFile android.WritablePath
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
pctx.HostBinToolVariable("assembleVintfCmd", "assemble_vintf")
|
||||||
|
android.RegisterModuleType("vintf_compatibility_matrix", vintfCompatibilityMatrixFactory)
|
||||||
|
}
|
||||||
|
|
||||||
|
func vintfCompatibilityMatrixFactory() android.Module {
|
||||||
|
g := &vintfCompatibilityMatrixRule{}
|
||||||
|
g.AddProperties(&g.properties)
|
||||||
|
android.InitAndroidArchModule(g, android.DeviceSupported, android.MultilibCommon)
|
||||||
|
return g
|
||||||
|
}
|
||||||
|
|
||||||
|
var _ android.AndroidMkDataProvider = (*vintfCompatibilityMatrixRule)(nil)
|
||||||
|
|
||||||
|
func (g *vintfCompatibilityMatrixRule) DepsMutator(ctx android.BottomUpMutatorContext) {
|
||||||
|
android.ExtractSourcesDeps(ctx, g.properties.Srcs)
|
||||||
|
ctx.AddDependency(ctx.Module(), kernelConfigTag, g.properties.Kernel_configs...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (g *vintfCompatibilityMatrixRule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||||
|
|
||||||
|
outputFilename := proptools.String(g.properties.Stem)
|
||||||
|
if outputFilename == "" {
|
||||||
|
outputFilename = g.Name()
|
||||||
|
}
|
||||||
|
|
||||||
|
inputPaths := android.PathsForModuleSrc(ctx, g.properties.Srcs)
|
||||||
|
ctx.VisitDirectDepsWithTag(kernelConfigTag, func(m android.Module) {
|
||||||
|
if k, ok := m.(*configs.KernelConfigRule); ok {
|
||||||
|
inputPaths = append(inputPaths, k.OutputPath())
|
||||||
|
} else {
|
||||||
|
ctx.PropertyErrorf("kernel_config",
|
||||||
|
"module %q is not a kernel_config", ctx.OtherModuleName(m))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
g.genFile = android.PathForModuleGen(ctx, outputFilename)
|
||||||
|
|
||||||
|
ctx.Build(pctx, android.BuildParams{
|
||||||
|
Rule: assembleVintfRule,
|
||||||
|
Description: "Framework Compatibility Matrix",
|
||||||
|
Implicits: inputPaths,
|
||||||
|
Output: g.genFile,
|
||||||
|
Args: map[string]string{
|
||||||
|
"inputs": strings.Join(inputPaths.Strings(), ":"),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
ctx.InstallFile(android.PathForModuleInstall(ctx, "etc", relpath), outputFilename, g.genFile)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (g *vintfCompatibilityMatrixRule) AndroidMk() android.AndroidMkData {
|
||||||
|
return android.AndroidMkData{
|
||||||
|
Class: "ETC",
|
||||||
|
OutputFile: android.OptionalPathForPath(g.genFile),
|
||||||
|
Extra: []android.AndroidMkExtraFunc{
|
||||||
|
func(w io.Writer, outputFile android.Path) {
|
||||||
|
fmt.Fprintln(w, "LOCAL_MODULE_RELATIVE_PATH :=", relpath)
|
||||||
|
if proptools.String(g.properties.Stem) != "" {
|
||||||
|
fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", proptools.String(g.properties.Stem))
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user