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

Merge "Add config.AndroidFirstDeviceTarget." am: 19bc60abee

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1456597

Change-Id: I65eef2bd265e70f2fd1f14176eb9ae03cd7598e9
This commit is contained in:
Jaewoong Jung
2020-10-12 17:46:49 +00:00
committed by Automerger Merge Worker
parent f45dbe2947 19bc60abee
commit 460960c457
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
android/config.go
View File

@@ -91,10 +91,11 @@ type config struct {
ConfigFileName string ConfigFileName string
ProductVariablesFileName string ProductVariablesFileName string
Targets map[OsType][]Target Targets map[OsType][]Target
BuildOSTarget Target // the Target for tools run on the build machine BuildOSTarget Target // the Target for tools run on the build machine
BuildOSCommonTarget Target // the Target for common (java) tools run on the build machine BuildOSCommonTarget Target // the Target for common (java) tools run on the build machine
AndroidCommonTarget Target // the Target for common modules for the Android device AndroidCommonTarget Target // the Target for common modules for the Android device
AndroidFirstDeviceTarget Target // the first Target for modules for the Android device
// multilibConflicts for an ArchType is true if there is earlier configured device architecture with the same // multilibConflicts for an ArchType is true if there is earlier configured device architecture with the same
// multilib value. // multilib value.
@@ -320,6 +321,7 @@ func TestArchConfig(buildDir string, env map[string]string, bp string, fs map[st
config.BuildOSTarget = config.Targets[BuildOs][0] config.BuildOSTarget = config.Targets[BuildOs][0]
config.BuildOSCommonTarget = getCommonTargets(config.Targets[BuildOs])[0] config.BuildOSCommonTarget = getCommonTargets(config.Targets[BuildOs])[0]
config.AndroidCommonTarget = getCommonTargets(config.Targets[Android])[0] config.AndroidCommonTarget = getCommonTargets(config.Targets[Android])[0]
config.AndroidFirstDeviceTarget = firstTarget(config.Targets[Android], "lib64", "lib32")[0]
config.TestProductVariables.DeviceArch = proptools.StringPtr("arm64") config.TestProductVariables.DeviceArch = proptools.StringPtr("arm64")
config.TestProductVariables.DeviceArchVariant = proptools.StringPtr("armv8-a") config.TestProductVariables.DeviceArchVariant = proptools.StringPtr("armv8-a")
config.TestProductVariables.DeviceSecondaryArch = proptools.StringPtr("arm") config.TestProductVariables.DeviceSecondaryArch = proptools.StringPtr("arm")
@@ -429,6 +431,7 @@ func NewConfig(srcDir, buildDir string, moduleListFile string) (Config, error) {
config.BuildOSCommonTarget = getCommonTargets(config.Targets[BuildOs])[0] config.BuildOSCommonTarget = getCommonTargets(config.Targets[BuildOs])[0]
if len(config.Targets[Android]) > 0 { if len(config.Targets[Android]) > 0 {
config.AndroidCommonTarget = getCommonTargets(config.Targets[Android])[0] config.AndroidCommonTarget = getCommonTargets(config.Targets[Android])[0]
config.AndroidFirstDeviceTarget = firstTarget(config.Targets[Android], "lib64", "lib32")[0]
} }
if err := config.fromEnv(); err != nil { if err := config.fromEnv(); err != nil {

4
java/app.go
View File

@@ -643,7 +643,7 @@ func (a *AndroidApp) jniBuildActions(jniLibs []jniLib, ctx android.ModuleContext
// Work with the team to come up with a new format that handles multilib modules properly // Work with the team to come up with a new format that handles multilib modules properly
// and change this. // and change this.
if len(ctx.Config().Targets[android.Android]) == 1 || if len(ctx.Config().Targets[android.Android]) == 1 ||
ctx.Config().Targets[android.Android][0].Arch.ArchType == jni.target.Arch.ArchType { ctx.Config().AndroidFirstDeviceTarget.Arch.ArchType == jni.target.Arch.ArchType {
a.jniCoverageOutputs = append(a.jniCoverageOutputs, jni.coverageFile.Path()) a.jniCoverageOutputs = append(a.jniCoverageOutputs, jni.coverageFile.Path())
} }
} }
@@ -1402,7 +1402,7 @@ func (a *AndroidAppImport) processVariants(ctx android.LoadHookContext) {
} }
archProps := reflect.ValueOf(a.archVariants).Elem().FieldByName("Arch") archProps := reflect.ValueOf(a.archVariants).Elem().FieldByName("Arch")
archType := ctx.Config().Targets[android.Android][0].Arch.ArchType archType := ctx.Config().AndroidFirstDeviceTarget.Arch.ArchType
MergePropertiesFromVariant(ctx, &a.properties, archProps, archType.Name) MergePropertiesFromVariant(ctx, &a.properties, archProps, archType.Name)
} }

2
rust/project_json.go
View File

@@ -93,7 +93,7 @@ func librarySource(ctx android.SingletonContext, rModule *Module, rustLib *libra
return "", false return "", false
} }
default: default:
if rModule.Target().String() != ctx.Config().Targets[android.Android][0].String() { if rModule.Target().String() != ctx.Config().AndroidFirstDeviceTarget.String() {
return "", false return "", false
} }
} }

2
sh/sh_binary.go
View File

@@ -261,7 +261,7 @@ func (s *ShTest) DepsMutator(ctx android.BottomUpMutatorContext) {
ctx.AddFarVariationDependencies(append(ctx.Target().Variations(), sharedLibVariations...), ctx.AddFarVariationDependencies(append(ctx.Target().Variations(), sharedLibVariations...),
shTestDataLibsTag, s.testProperties.Data_libs...) shTestDataLibsTag, s.testProperties.Data_libs...)
if ctx.Target().Os.Class == android.Host && len(ctx.Config().Targets[android.Android]) > 0 { if ctx.Target().Os.Class == android.Host && len(ctx.Config().Targets[android.Android]) > 0 {
deviceVariations := ctx.Config().Targets[android.Android][0].Variations() deviceVariations := ctx.Config().AndroidFirstDeviceTarget.Variations()
ctx.AddFarVariationDependencies(deviceVariations, shTestDataDeviceBinsTag, s.testProperties.Data_device_bins...) ctx.AddFarVariationDependencies(deviceVariations, shTestDataDeviceBinsTag, s.testProperties.Data_device_bins...)
ctx.AddFarVariationDependencies(append(deviceVariations, sharedLibVariations...), ctx.AddFarVariationDependencies(append(deviceVariations, sharedLibVariations...),
shTestDataDeviceLibsTag, s.testProperties.Data_device_libs...) shTestDataDeviceLibsTag, s.testProperties.Data_device_libs...)