openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge changes I545a832a,I85a51b04 am: 54956abf1f 

am: 2f27762373

Change-Id: Ib0b19484d9e0481c24c2da4f47c56e5d167fe1e1
This commit is contained in:
Colin Cross 2019-02-04 09:57:50 -08:00 committed by android-build-merger
parent 1283de522f 2f27762373
commit dec157bd6c
20 changed files with 57 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
android/arch.go
View File

@ -1169,7 +1169,7 @@ func decodeTargetProductVariables(config *config) (map[OsType][]Target, error) {
targets := make(map[OsType][]Target)
var targetErr error
addTarget := func(os OsType, archName string, archVariant, cpuVariant *string, abi *[]string) {
addTarget := func(os OsType, archName string, archVariant, cpuVariant *string, abi []string) {
if targetErr != nil {
return
}
@ -1358,7 +1358,7 @@ func decodeArchSettings(os OsType, archConfigs []archConfig) ([]Target, error) {
for _, config := range archConfigs {
arch, err := decodeArch(os, config.arch, &config.archVariant,
&config.cpuVariant, &config.abi)
&config.cpuVariant, config.abi)
if err != nil {
return nil, err
}
@ -1373,7 +1373,7 @@ func decodeArchSettings(os OsType, archConfigs []archConfig) ([]Target, error) {
}
// Convert a set of strings from product variables into a single Arch struct
func decodeArch(os OsType, arch string, archVariant, cpuVariant *string, abi *[]string) (Arch, error) {
func decodeArch(os OsType, arch string, archVariant, cpuVariant *string, abi []string) (Arch, error) {
stringPtr := func(p *string) string {
if p != nil {
return *p
@ -1381,13 +1381,6 @@ func decodeArch(os OsType, arch string, archVariant, cpuVariant *string, abi *[]
return ""
}
slicePtr := func(p *[]string) []string {
if p != nil {
return *p
}
return nil
}
archType, ok := archTypeMap[arch]
if !ok {
return Arch{}, fmt.Errorf("unknown arch %q", arch)
@ -1397,7 +1390,7 @@ func decodeArch(os OsType, arch string, archVariant, cpuVariant *string, abi *[]
ArchType: archType,
ArchVariant: stringPtr(archVariant),
CpuVariant: stringPtr(cpuVariant),
Abi: slicePtr(abi),
Abi: abi,
Native: true,
}

44
android/config.go
View File

@ -202,10 +202,10 @@ func TestConfig(buildDir string, env map[string]string) Config {
productVariables: productVariables{
DeviceName: stringPtr("test_device"),
Platform_sdk_version: intPtr(26),
AAPTConfig: &[]string{"normal", "large", "xlarge", "hdpi", "xhdpi", "xxhdpi"},
AAPTConfig: []string{"normal", "large", "xlarge", "hdpi", "xhdpi", "xxhdpi"},
AAPTPreferredConfig: stringPtr("xhdpi"),
AAPTCharacteristics: stringPtr("nosdcard"),
AAPTPrebuiltDPI: &[]string{"xhdpi", "xxhdpi"},
AAPTPrebuiltDPI: []string{"xhdpi", "xxhdpi"},
},
buildDir: buildDir,
@ -476,10 +476,7 @@ func (c *config) DeviceName() string {
}
func (c *config) ResourceOverlays() []string {
if c.productVariables.ResourceOverlays == nil {
return nil
}
return *c.productVariables.ResourceOverlays
return c.productVariables.ResourceOverlays
}
func (c *config) PlatformVersionName() string {
@ -544,7 +541,7 @@ func (c *config) PlatformVersionCombinedCodenames() []string {
}
func (c *config) ProductAAPTConfig() []string {
return stringSlice(c.productVariables.AAPTConfig)
return c.productVariables.AAPTConfig
}
func (c *config) ProductAAPTPreferredConfig() string {
@ -556,7 +553,7 @@ func (c *config) ProductAAPTCharacteristics() string {
}
func (c *config) ProductAAPTPrebuiltDPI() []string {
return stringSlice(c.productVariables.AAPTPrebuiltDPI)
return c.productVariables.AAPTPrebuiltDPI
}
func (c *config) DefaultAppCertificateDir(ctx PathContext) SourcePath {
@ -734,10 +731,10 @@ func (c *config) ArtUseReadBarrier() bool {
func (c *config) EnforceRROForModule(name string) bool {
enforceList := c.productVariables.EnforceRROTargets
if enforceList != nil {
if len(*enforceList) == 1 && (*enforceList)[0] == "*" {
if len(enforceList) == 1 && (enforceList)[0] == "*" {
return true
}
return InList(name, *enforceList)
return InList(name, enforceList)
}
return false
}
@ -745,7 +742,7 @@ func (c *config) EnforceRROForModule(name string) bool {
func (c *config) EnforceRROExcludedOverlay(path string) bool {
excluded := c.productVariables.EnforceRROExcludedOverlays
if excluded != nil {
for _, exclude := range *excluded {
for _, exclude := range excluded {
if strings.HasPrefix(path, exclude) {
return true
}
@ -830,10 +827,7 @@ func (c *deviceConfig) ExtraVndkVersions() []string {
}
func (c *deviceConfig) SystemSdkVersions() []string {
if c.config.productVariables.DeviceSystemSdkVersions == nil {
return nil
}
return *c.config.productVariables.DeviceSystemSdkVersions
return c.config.productVariables.DeviceSystemSdkVersions
}
func (c *deviceConfig) PlatformSystemSdkVersions() []string {
@ -876,12 +870,12 @@ func (c *deviceConfig) NativeCoverageEnabled() bool {
func (c *deviceConfig) CoverageEnabledForPath(path string) bool {
coverage := false
if c.config.productVariables.CoveragePaths != nil {
if PrefixInList(path, *c.config.productVariables.CoveragePaths) {
if PrefixInList(path, c.config.productVariables.CoveragePaths) {
coverage = true
}
}
if coverage && c.config.productVariables.CoverageExcludePaths != nil {
if PrefixInList(path, *c.config.productVariables.CoverageExcludePaths) {
if PrefixInList(path, c.config.productVariables.CoverageExcludePaths) {
coverage = false
}
}
@ -962,28 +956,28 @@ func (c *config) IntegerOverflowDisabledForPath(path string) bool {
if c.productVariables.IntegerOverflowExcludePaths == nil {
return false
}
return PrefixInList(path, *c.productVariables.IntegerOverflowExcludePaths)
return PrefixInList(path, c.productVariables.IntegerOverflowExcludePaths)
}
func (c *config) CFIDisabledForPath(path string) bool {
if c.productVariables.CFIExcludePaths == nil {
return false
}
return PrefixInList(path, *c.productVariables.CFIExcludePaths)
return PrefixInList(path, c.productVariables.CFIExcludePaths)
}
func (c *config) CFIEnabledForPath(path string) bool {
if c.productVariables.CFIIncludePaths == nil {
return false
}
return PrefixInList(path, *c.productVariables.CFIIncludePaths)
return PrefixInList(path, c.productVariables.CFIIncludePaths)
}
func (c *config) XOMDisabledForPath(path string) bool {
if c.productVariables.XOMExcludePaths == nil {
return false
}
return PrefixInList(path, *c.productVariables.XOMExcludePaths)
return PrefixInList(path, c.productVariables.XOMExcludePaths)
}
func (c *config) VendorConfig(name string) VendorConfig {
@ -1035,11 +1029,3 @@ func (c *config) HiddenAPIFlags() string {
func (c *config) HiddenAPIExtraAppUsageJars() []string {
return c.productVariables.HiddenAPIExtraAppUsageJars
}
func stringSlice(s *[]string) []string {
if s != nil {
return *s
} else {
return nil
}
}

2
android/module.go
View File

@ -481,6 +481,8 @@ type ModuleBase struct {
prefer32 func(ctx BaseModuleContext, base *ModuleBase, class OsClass) bool
}
func (a *ModuleBase) DepsMutator(BottomUpMutatorContext) {}
func (a *ModuleBase) AddProperties(props ...interface{}) {
a.registerProps = append(a.registerProps, props...)
}

3
android/namespace.go
View File

@ -366,9 +366,6 @@ type NamespaceModule struct {
}
}
func (n *NamespaceModule) DepsMutator(context BottomUpMutatorContext) {
}
func (n *NamespaceModule) GenerateAndroidBuildActions(ctx ModuleContext) {
}

6
android/neverallow_test.go
View File

@ -222,9 +222,6 @@ func newMockCcLibraryModule() Module {
return m
}
func (p *mockCcLibraryModule) DepsMutator(ctx BottomUpMutatorContext) {
}
func (p *mockCcLibraryModule) GenerateAndroidBuildActions(ModuleContext) {
}
@ -244,8 +241,5 @@ func newMockJavaLibraryModule() Module {
return m
}
func (p *mockJavaLibraryModule) DepsMutator(ctx BottomUpMutatorContext) {
}
func (p *mockJavaLibraryModule) GenerateAndroidBuildActions(ModuleContext) {
}

3
android/prebuilt_test.go
View File

@ -212,9 +212,6 @@ func (p *prebuiltModule) Name() string {
return p.prebuilt.Name(p.ModuleBase.Name())
}
func (p *prebuiltModule) DepsMutator(ctx BottomUpMutatorContext) {
}
func (p *prebuiltModule) GenerateAndroidBuildActions(ModuleContext) {
}

62
android/variable.go
View File

@ -144,18 +144,18 @@ type productVariables struct {
Platform_vndk_version *string `json:",omitempty"`
Platform_systemsdk_versions []string `json:",omitempty"`
DeviceName *string `json:",omitempty"`
DeviceArch *string `json:",omitempty"`
DeviceArchVariant *string `json:",omitempty"`
DeviceCpuVariant *string `json:",omitempty"`
DeviceAbi *[]string `json:",omitempty"`
DeviceVndkVersion *string `json:",omitempty"`
DeviceSystemSdkVersions *[]string `json:",omitempty"`
DeviceName *string `json:",omitempty"`
DeviceArch *string `json:",omitempty"`
DeviceArchVariant *string `json:",omitempty"`
DeviceCpuVariant *string `json:",omitempty"`
DeviceAbi []string `json:",omitempty"`
DeviceVndkVersion *string `json:",omitempty"`
DeviceSystemSdkVersions []string `json:",omitempty"`
DeviceSecondaryArch *string `json:",omitempty"`
DeviceSecondaryArchVariant *string `json:",omitempty"`
DeviceSecondaryCpuVariant *string `json:",omitempty"`
DeviceSecondaryAbi *[]string `json:",omitempty"`
DeviceSecondaryArch *string `json:",omitempty"`
DeviceSecondaryArchVariant *string `json:",omitempty"`
DeviceSecondaryCpuVariant *string `json:",omitempty"`
DeviceSecondaryAbi []string `json:",omitempty"`
HostArch *string `json:",omitempty"`
HostSecondaryArch *string `json:",omitempty"`
@ -164,14 +164,14 @@ type productVariables struct {
CrossHostArch *string `json:",omitempty"`
CrossHostSecondaryArch *string `json:",omitempty"`
ResourceOverlays *[]string `json:",omitempty"`
EnforceRROTargets *[]string `json:",omitempty"`
EnforceRROExcludedOverlays *[]string `json:",omitempty"`
ResourceOverlays []string `json:",omitempty"`
EnforceRROTargets []string `json:",omitempty"`
EnforceRROExcludedOverlays []string `json:",omitempty"`
AAPTCharacteristics *string `json:",omitempty"`
AAPTConfig *[]string `json:",omitempty"`
AAPTPreferredConfig *string `json:",omitempty"`
AAPTPrebuiltDPI *[]string `json:",omitempty"`
AAPTCharacteristics *string `json:",omitempty"`
AAPTConfig []string `json:",omitempty"`
AAPTPreferredConfig *string `json:",omitempty"`
AAPTPrebuiltDPI []string `json:",omitempty"`
DefaultAppCertificate *string `json:",omitempty"`
@ -207,14 +207,14 @@ type productVariables struct {
DisableDexPreoptModules []string `json:",omitempty"`
DexPreoptProfileDir *string `json:",omitempty"`
IntegerOverflowExcludePaths *[]string `json:",omitempty"`
IntegerOverflowExcludePaths []string `json:",omitempty"`
EnableCFI *bool `json:",omitempty"`
CFIExcludePaths *[]string `json:",omitempty"`
CFIIncludePaths *[]string `json:",omitempty"`
EnableCFI *bool `json:",omitempty"`
CFIExcludePaths []string `json:",omitempty"`
CFIIncludePaths []string `json:",omitempty"`
EnableXOM *bool `json:",omitempty"`
XOMExcludePaths *[]string `json:",omitempty"`
EnableXOM *bool `json:",omitempty"`
XOMExcludePaths []string `json:",omitempty"`
VendorPath *string `json:",omitempty"`
OdmPath *string `json:",omitempty"`
@ -224,9 +224,9 @@ type productVariables struct {
ClangTidy *bool `json:",omitempty"`
TidyChecks *string `json:",omitempty"`
NativeCoverage *bool `json:",omitempty"`
CoveragePaths *[]string `json:",omitempty"`
CoverageExcludePaths *[]string `json:",omitempty"`
NativeCoverage *bool `json:",omitempty"`
CoveragePaths []string `json:",omitempty"`
CoverageExcludePaths []string `json:",omitempty"`
DevicePrefer32BitApps *bool `json:",omitempty"`
DevicePrefer32BitExecutables *bool `json:",omitempty"`
@ -306,16 +306,16 @@ func (v *productVariables) SetDefaultConfig() {
DeviceArch: stringPtr("arm64"),
DeviceArchVariant: stringPtr("armv8-a"),
DeviceCpuVariant: stringPtr("generic"),
DeviceAbi: &[]string{"arm64-v8a"},
DeviceAbi: []string{"arm64-v8a"},
DeviceSecondaryArch: stringPtr("arm"),
DeviceSecondaryArchVariant: stringPtr("armv8-a"),
DeviceSecondaryCpuVariant: stringPtr("generic"),
DeviceSecondaryAbi: &[]string{"armeabi-v7a", "armeabi"},
DeviceSecondaryAbi: []string{"armeabi-v7a", "armeabi"},
AAPTConfig: &[]string{"normal", "large", "xlarge", "hdpi", "xhdpi", "xxhdpi"},
AAPTConfig: []string{"normal", "large", "xlarge", "hdpi", "xhdpi", "xxhdpi"},
AAPTPreferredConfig: stringPtr("xhdpi"),
AAPTCharacteristics: stringPtr("nosdcard"),
AAPTPrebuiltDPI: &[]string{"xhdpi", "xxhdpi"},
AAPTPrebuiltDPI: []string{"xhdpi", "xxhdpi"},
Malloc_not_svelte: boolPtr(true),
Safestack: boolPtr(false),

4
apex/key.go
View File

@ -19,6 +19,7 @@ import (
"io"
"android/soong/android"
"github.com/google/blueprint/proptools"
)
@ -61,9 +62,6 @@ func (m *apexKey) installable() bool {
return m.properties.Installable == nil || proptools.Bool(m.properties.Installable)
}
func (m *apexKey) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func (m *apexKey) GenerateAndroidBuildActions(ctx android.ModuleContext) {
if ctx.Config().FlattenApex() && !ctx.Config().UnbundledBuild() {
// Flattened APEXes are not signed

3
cc/cc.go
View File

@ -1869,9 +1869,6 @@ type Defaults struct {
func (*Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
func (d *Defaults) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func defaultsFactory() android.Module {
return DefaultsFactory()
}

9
cc/ndk_headers.go
View File

@ -93,9 +93,6 @@ type headerModule struct {
licensePath android.ModuleSrcPath
}
func (m *headerModule) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func getHeaderInstallDir(ctx android.ModuleContext, header android.Path, from string,
to string) android.OutputPath {
// Output path is the sysroot base + "usr/include" + to directory + directory component
@ -210,9 +207,6 @@ type versionedHeaderModule struct {
licensePath android.ModuleSrcPath
}
func (m *versionedHeaderModule) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func (m *versionedHeaderModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
if String(m.properties.License) == "" {
ctx.PropertyErrorf("license", "field is required")
@ -335,9 +329,6 @@ type preprocessedHeadersModule struct {
licensePath android.ModuleSrcPath
}
func (m *preprocessedHeadersModule) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func (m *preprocessedHeadersModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
if String(m.properties.License) == "" {
ctx.PropertyErrorf("license", "field is required")

3
genrule/genrule.go
View File

@ -528,9 +528,6 @@ type Defaults struct {
func (*Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
func (d *Defaults) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func defaultsFactory() android.Module {
return DefaultsFactory()
}

2
genrule/genrule_test.go
View File

@ -519,8 +519,6 @@ func toolFactory() android.Module {
return module
}
func (t *testTool) DepsMutator(ctx android.BottomUpMutatorContext) {}
func (t *testTool) GenerateAndroidBuildActions(ctx android.ModuleContext) {
t.outputFile = android.PathForTesting("out", ctx.ModuleName())
}

3
java/app.go
View File

@ -503,9 +503,6 @@ func AndroidAppCertificateFactory() android.Module {
return module
}
func (c *AndroidAppCertificate) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func (c *AndroidAppCertificate) GenerateAndroidBuildActions(ctx android.ModuleContext) {
cert := String(c.properties.Certificate)
c.Certificate = Certificate{

6
java/app_test.go
View File

@ -199,12 +199,12 @@ func TestEnforceRRO(t *testing.T) {
for _, testCase := range testEnforceRROTests {
t.Run(testCase.name, func(t *testing.T) {
config := testConfig(nil)
config.TestProductVariables.ResourceOverlays = &resourceOverlays
config.TestProductVariables.ResourceOverlays = resourceOverlays
if testCase.enforceRROTargets != nil {
config.TestProductVariables.EnforceRROTargets = &testCase.enforceRROTargets
config.TestProductVariables.EnforceRROTargets = testCase.enforceRROTargets
}
if testCase.enforceRROExcludedOverlays != nil {
config.TestProductVariables.EnforceRROExcludedOverlays = &testCase.enforceRROExcludedOverlays
config.TestProductVariables.EnforceRROExcludedOverlays = testCase.enforceRROExcludedOverlays
}
ctx := testAppContext(config, bp, fs)

3
java/droiddoc.go
View File

@ -1816,9 +1816,6 @@ type DocDefaults struct {
func (*DocDefaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
func (d *DocDefaults) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func DocDefaultsFactory() android.Module {
module := &DocDefaults{}

3
java/java.go
View File

@ -1840,9 +1840,6 @@ type Defaults struct {
func (*Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
func (d *Defaults) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func defaultsFactory() android.Module {
return DefaultsFactory()
}

2
java/java_test.go
View File

@ -61,7 +61,7 @@ func testConfig(env map[string]string) android.Config {
env["ANDROID_JAVA8_HOME"] = "jdk8"
}
config := android.TestArchConfig(buildDir, env)
config.TestProductVariables.DeviceSystemSdkVersions = &[]string{"14", "15"}
config.TestProductVariables.DeviceSystemSdkVersions = []string{"14", "15"}
return config
}

4
java/prebuilt_apis.go
View File

@ -47,10 +47,6 @@ type prebuiltApis struct {
properties prebuiltApisProperties
}
func (module *prebuiltApis) DepsMutator(ctx android.BottomUpMutatorContext) {
// no need to implement
}
func (module *prebuiltApis) GenerateAndroidBuildActions(ctx android.ModuleContext) {
// no need to implement
}

3
phony/phony.go
View File

@ -38,9 +38,6 @@ func PhonyFactory() android.Module {
return module
}
func (p *phony) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func (p *phony) GenerateAndroidBuildActions(ctx android.ModuleContext) {
p.requiredModuleNames = ctx.RequiredModuleNames()
if len(p.requiredModuleNames) == 0 {

3
python/defaults.go
View File

@ -30,9 +30,6 @@ type Defaults struct {
func (d *Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
func (d *Defaults) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func defaultsFactory() android.Module {
return DefaultsFactory()
}