diff options
Diffstat (limited to 'android/androidmk.go')
| -rw-r--r-- | android/androidmk.go | 53 |
1 files changed, 38 insertions, 15 deletions
diff --git a/android/androidmk.go b/android/androidmk.go index fafbfd61e..ddd51ffd5 100644 --- a/android/androidmk.go +++ b/android/androidmk.go @@ -304,15 +304,16 @@ func (a *AndroidMkEntries) fillInEntries(config Config, bpPath string, mod bluep host := false switch amod.Os().Class { case Host: - // Make cannot identify LOCAL_MODULE_HOST_ARCH:= common. - if amod.Arch().ArchType != Common { - a.SetString("LOCAL_MODULE_HOST_ARCH", archStr) - } - host = true - case HostCross: - // Make cannot identify LOCAL_MODULE_HOST_CROSS_ARCH:= common. - if amod.Arch().ArchType != Common { - a.SetString("LOCAL_MODULE_HOST_CROSS_ARCH", archStr) + if amod.Target().HostCross { + // Make cannot identify LOCAL_MODULE_HOST_CROSS_ARCH:= common. + if amod.Arch().ArchType != Common { + a.SetString("LOCAL_MODULE_HOST_CROSS_ARCH", archStr) + } + } else { + // Make cannot identify LOCAL_MODULE_HOST_ARCH:= common. + if amod.Arch().ArchType != Common { + a.SetString("LOCAL_MODULE_HOST_ARCH", archStr) + } } host = true case Device: @@ -359,9 +360,11 @@ func (a *AndroidMkEntries) fillInEntries(config Config, bpPath string, mod bluep if amod.ArchSpecific() { switch amod.Os().Class { case Host: - prefix = "HOST_" - case HostCross: - prefix = "HOST_CROSS_" + if amod.Target().HostCross { + prefix = "HOST_CROSS_" + } else { + prefix = "HOST_" + } case Device: prefix = "TARGET_" @@ -563,9 +566,11 @@ func translateAndroidModule(ctx SingletonContext, w io.Writer, mod blueprint.Mod if amod.ArchSpecific() { switch amod.Os().Class { case Host: - prefix = "HOST_" - case HostCross: - prefix = "HOST_CROSS_" + if amod.Target().HostCross { + prefix = "HOST_CROSS_" + } else { + prefix = "HOST_" + } case Device: prefix = "TARGET_" @@ -634,3 +639,21 @@ func shouldSkipAndroidMkProcessing(module *ModuleBase) bool { // Make does not understand LinuxBionic module.Os() == LinuxBionic } + +func AndroidMkDataPaths(data []DataPath) []string { + var testFiles []string + for _, d := range data { + rel := d.SrcPath.Rel() + path := d.SrcPath.String() + if !strings.HasSuffix(path, rel) { + panic(fmt.Errorf("path %q does not end with %q", path, rel)) + } + path = strings.TrimSuffix(path, rel) + testFileString := path + ":" + rel + if len(d.RelativeInstallPath) > 0 { + testFileString += ":" + d.RelativeInstallPath + } + testFiles = append(testFiles, testFileString) + } + return testFiles +} |