2015-09-24 00:26:20 +02:00
|
|
|
// Copyright 2015 Google Inc. All rights reserved.
|
|
|
|
//
|
|
|
|
// 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.
|
|
|
|
|
2016-05-19 00:37:25 +02:00
|
|
|
package android
|
2015-09-24 00:26:20 +02:00
|
|
|
|
|
|
|
import (
|
|
|
|
"errors"
|
|
|
|
"fmt"
|
|
|
|
"reflect"
|
2020-02-29 00:34:17 +01:00
|
|
|
"strconv"
|
2015-09-24 00:26:20 +02:00
|
|
|
"strings"
|
|
|
|
"testing"
|
2021-04-13 14:13:49 +02:00
|
|
|
|
|
|
|
"github.com/google/blueprint/proptools"
|
2015-09-24 00:26:20 +02:00
|
|
|
)
|
|
|
|
|
|
|
|
type strsTestCase struct {
|
|
|
|
in []string
|
|
|
|
out string
|
|
|
|
err []error
|
|
|
|
}
|
|
|
|
|
|
|
|
var commonValidatePathTestCases = []strsTestCase{
|
|
|
|
{
|
|
|
|
in: []string{""},
|
|
|
|
out: "",
|
|
|
|
},
|
2023-10-24 23:17:03 +02:00
|
|
|
{
|
|
|
|
in: []string{"", ""},
|
|
|
|
out: "",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: []string{"a", ""},
|
|
|
|
out: "a",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: []string{"", "a"},
|
|
|
|
out: "a",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: []string{"", "a", ""},
|
|
|
|
out: "a",
|
|
|
|
},
|
2015-09-24 00:26:20 +02:00
|
|
|
{
|
|
|
|
in: []string{"a/b"},
|
|
|
|
out: "a/b",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: []string{"a/b", "c"},
|
|
|
|
out: "a/b/c",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: []string{"a/.."},
|
|
|
|
out: ".",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: []string{"."},
|
|
|
|
out: ".",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: []string{".."},
|
|
|
|
out: "",
|
|
|
|
err: []error{errors.New("Path is outside directory: ..")},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: []string{"../a"},
|
|
|
|
out: "",
|
|
|
|
err: []error{errors.New("Path is outside directory: ../a")},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: []string{"b/../../a"},
|
|
|
|
out: "",
|
|
|
|
err: []error{errors.New("Path is outside directory: ../a")},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: []string{"/a"},
|
|
|
|
out: "",
|
|
|
|
err: []error{errors.New("Path is outside directory: /a")},
|
|
|
|
},
|
2015-12-21 23:57:11 +01:00
|
|
|
{
|
|
|
|
in: []string{"a", "../b"},
|
|
|
|
out: "",
|
|
|
|
err: []error{errors.New("Path is outside directory: ../b")},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: []string{"a", "b/../../c"},
|
|
|
|
out: "",
|
|
|
|
err: []error{errors.New("Path is outside directory: ../c")},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: []string{"a", "./.."},
|
|
|
|
out: "",
|
|
|
|
err: []error{errors.New("Path is outside directory: ..")},
|
|
|
|
},
|
2015-09-24 00:26:20 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
var validateSafePathTestCases = append(commonValidatePathTestCases, []strsTestCase{
|
|
|
|
{
|
|
|
|
in: []string{"$host/../$a"},
|
|
|
|
out: "$a",
|
|
|
|
},
|
|
|
|
}...)
|
|
|
|
|
|
|
|
var validatePathTestCases = append(commonValidatePathTestCases, []strsTestCase{
|
|
|
|
{
|
|
|
|
in: []string{"$host/../$a"},
|
|
|
|
out: "",
|
|
|
|
err: []error{errors.New("Path contains invalid character($): $host/../$a")},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: []string{"$host/.."},
|
|
|
|
out: "",
|
|
|
|
err: []error{errors.New("Path contains invalid character($): $host/..")},
|
|
|
|
},
|
|
|
|
}...)
|
|
|
|
|
|
|
|
func TestValidateSafePath(t *testing.T) {
|
|
|
|
for _, testCase := range validateSafePathTestCases {
|
2018-02-22 22:48:13 +01:00
|
|
|
t.Run(strings.Join(testCase.in, ","), func(t *testing.T) {
|
|
|
|
ctx := &configErrorWrapper{}
|
2018-02-22 22:54:26 +01:00
|
|
|
out, err := validateSafePath(testCase.in...)
|
|
|
|
if err != nil {
|
|
|
|
reportPathError(ctx, err)
|
|
|
|
}
|
2018-02-22 22:48:13 +01:00
|
|
|
check(t, "validateSafePath", p(testCase.in), out, ctx.errors, testCase.out, testCase.err)
|
|
|
|
})
|
2015-09-24 00:26:20 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestValidatePath(t *testing.T) {
|
|
|
|
for _, testCase := range validatePathTestCases {
|
2018-02-22 22:48:13 +01:00
|
|
|
t.Run(strings.Join(testCase.in, ","), func(t *testing.T) {
|
|
|
|
ctx := &configErrorWrapper{}
|
2018-02-22 22:54:26 +01:00
|
|
|
out, err := validatePath(testCase.in...)
|
|
|
|
if err != nil {
|
|
|
|
reportPathError(ctx, err)
|
|
|
|
}
|
2018-02-22 22:48:13 +01:00
|
|
|
check(t, "validatePath", p(testCase.in), out, ctx.errors, testCase.out, testCase.err)
|
|
|
|
})
|
2015-09-24 00:26:20 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestOptionalPath(t *testing.T) {
|
|
|
|
var path OptionalPath
|
2021-09-15 03:39:00 +02:00
|
|
|
checkInvalidOptionalPath(t, path, "unknown")
|
2015-09-24 00:26:20 +02:00
|
|
|
|
|
|
|
path = OptionalPathForPath(nil)
|
2021-09-15 03:39:00 +02:00
|
|
|
checkInvalidOptionalPath(t, path, "unknown")
|
|
|
|
|
|
|
|
path = InvalidOptionalPath("foo")
|
|
|
|
checkInvalidOptionalPath(t, path, "foo")
|
|
|
|
|
|
|
|
path = InvalidOptionalPath("")
|
|
|
|
checkInvalidOptionalPath(t, path, "unknown")
|
2021-05-13 12:11:15 +02:00
|
|
|
|
|
|
|
path = OptionalPathForPath(PathForTesting("path"))
|
|
|
|
checkValidOptionalPath(t, path, "path")
|
2015-09-24 00:26:20 +02:00
|
|
|
}
|
|
|
|
|
2021-09-15 03:39:00 +02:00
|
|
|
func checkInvalidOptionalPath(t *testing.T, path OptionalPath, expectedInvalidReason string) {
|
2018-02-22 22:48:13 +01:00
|
|
|
t.Helper()
|
2015-09-24 00:26:20 +02:00
|
|
|
if path.Valid() {
|
2021-09-15 03:39:00 +02:00
|
|
|
t.Errorf("Invalid OptionalPath should not be valid")
|
|
|
|
}
|
|
|
|
if path.InvalidReason() != expectedInvalidReason {
|
|
|
|
t.Errorf("Wrong invalid reason: expected %q, got %q", expectedInvalidReason, path.InvalidReason())
|
2015-09-24 00:26:20 +02:00
|
|
|
}
|
|
|
|
if path.String() != "" {
|
2021-09-15 03:39:00 +02:00
|
|
|
t.Errorf("Invalid OptionalPath String() should return \"\", not %q", path.String())
|
2015-09-24 00:26:20 +02:00
|
|
|
}
|
2021-05-13 12:11:15 +02:00
|
|
|
paths := path.AsPaths()
|
|
|
|
if len(paths) != 0 {
|
2021-09-15 03:39:00 +02:00
|
|
|
t.Errorf("Invalid OptionalPath AsPaths() should return empty Paths, not %q", paths)
|
2021-05-13 12:11:15 +02:00
|
|
|
}
|
2015-09-24 00:26:20 +02:00
|
|
|
defer func() {
|
|
|
|
if r := recover(); r == nil {
|
|
|
|
t.Errorf("Expected a panic when calling Path() on an uninitialized OptionalPath")
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
path.Path()
|
|
|
|
}
|
|
|
|
|
2021-05-13 12:11:15 +02:00
|
|
|
func checkValidOptionalPath(t *testing.T, path OptionalPath, expectedString string) {
|
|
|
|
t.Helper()
|
|
|
|
if !path.Valid() {
|
|
|
|
t.Errorf("Initialized OptionalPath should not be invalid")
|
|
|
|
}
|
2021-09-15 03:39:00 +02:00
|
|
|
if path.InvalidReason() != "" {
|
|
|
|
t.Errorf("Initialized OptionalPath should not have an invalid reason, got: %q", path.InvalidReason())
|
|
|
|
}
|
2021-05-13 12:11:15 +02:00
|
|
|
if path.String() != expectedString {
|
|
|
|
t.Errorf("Initialized OptionalPath String() should return %q, not %q", expectedString, path.String())
|
|
|
|
}
|
|
|
|
paths := path.AsPaths()
|
|
|
|
if len(paths) != 1 {
|
|
|
|
t.Errorf("Initialized OptionalPath AsPaths() should return Paths with length 1, not %q", paths)
|
|
|
|
}
|
|
|
|
path.Path()
|
|
|
|
}
|
|
|
|
|
2015-09-24 00:26:20 +02:00
|
|
|
func check(t *testing.T, testType, testString string,
|
|
|
|
got interface{}, err []error,
|
|
|
|
expected interface{}, expectedErr []error) {
|
2018-02-22 22:48:13 +01:00
|
|
|
t.Helper()
|
2015-09-24 00:26:20 +02:00
|
|
|
|
|
|
|
printedTestCase := false
|
|
|
|
e := func(s string, expected, got interface{}) {
|
2018-02-22 22:48:13 +01:00
|
|
|
t.Helper()
|
2015-09-24 00:26:20 +02:00
|
|
|
if !printedTestCase {
|
|
|
|
t.Errorf("test case %s: %s", testType, testString)
|
|
|
|
printedTestCase = true
|
|
|
|
}
|
|
|
|
t.Errorf("incorrect %s", s)
|
|
|
|
t.Errorf(" expected: %s", p(expected))
|
|
|
|
t.Errorf(" got: %s", p(got))
|
|
|
|
}
|
|
|
|
|
|
|
|
if !reflect.DeepEqual(expectedErr, err) {
|
|
|
|
e("errors:", expectedErr, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if !reflect.DeepEqual(expected, got) {
|
|
|
|
e("output:", expected, got)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func p(in interface{}) string {
|
|
|
|
if v, ok := in.([]interface{}); ok {
|
|
|
|
s := make([]string, len(v))
|
|
|
|
for i := range v {
|
|
|
|
s[i] = fmt.Sprintf("%#v", v[i])
|
|
|
|
}
|
|
|
|
return "[" + strings.Join(s, ", ") + "]"
|
|
|
|
} else {
|
|
|
|
return fmt.Sprintf("%#v", in)
|
|
|
|
}
|
|
|
|
}
|
2017-07-07 01:59:48 +02:00
|
|
|
|
2019-12-14 05:41:13 +01:00
|
|
|
func pathTestConfig(buildDir string) Config {
|
|
|
|
return TestConfig(buildDir, nil, "", nil)
|
|
|
|
}
|
|
|
|
|
2017-07-07 01:59:48 +02:00
|
|
|
func TestPathForModuleInstall(t *testing.T) {
|
2019-12-14 05:41:13 +01:00
|
|
|
testConfig := pathTestConfig("")
|
2017-07-07 01:59:48 +02:00
|
|
|
|
2020-09-01 05:37:45 +02:00
|
|
|
hostTarget := Target{Os: Linux, Arch: Arch{ArchType: X86}}
|
|
|
|
deviceTarget := Target{Os: Android, Arch: Arch{ArchType: Arm64}}
|
2017-07-07 01:59:48 +02:00
|
|
|
|
|
|
|
testCases := []struct {
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
name string
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx *testModuleInstallPathContext
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in []string
|
|
|
|
out string
|
|
|
|
partitionDir string
|
2017-07-07 01:59:48 +02:00
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "host binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: hostTarget.Os,
|
|
|
|
target: hostTarget,
|
|
|
|
},
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"bin", "my_test"},
|
|
|
|
out: "host/linux-x86/bin/my_test",
|
|
|
|
partitionDir: "host/linux-x86",
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
|
|
|
|
|
|
|
{
|
|
|
|
name: "system binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"bin", "my_test"},
|
|
|
|
out: "target/product/test_device/system/bin/my_test",
|
|
|
|
partitionDir: "target/product/test_device/system",
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "vendor binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-12-31 03:43:07 +01:00
|
|
|
earlyModuleContext: earlyModuleContext{
|
|
|
|
kind: socSpecificModule,
|
|
|
|
},
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"bin", "my_test"},
|
|
|
|
out: "target/product/test_device/vendor/bin/my_test",
|
|
|
|
partitionDir: "target/product/test_device/vendor",
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
2017-11-08 08:03:48 +01:00
|
|
|
{
|
|
|
|
name: "odm binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-12-31 03:43:07 +01:00
|
|
|
earlyModuleContext: earlyModuleContext{
|
|
|
|
kind: deviceSpecificModule,
|
|
|
|
},
|
2017-11-08 08:03:48 +01:00
|
|
|
},
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"bin", "my_test"},
|
|
|
|
out: "target/product/test_device/odm/bin/my_test",
|
|
|
|
partitionDir: "target/product/test_device/odm",
|
2017-11-08 08:03:48 +01:00
|
|
|
},
|
|
|
|
{
|
2018-01-10 11:00:15 +01:00
|
|
|
name: "product binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-12-31 03:43:07 +01:00
|
|
|
earlyModuleContext: earlyModuleContext{
|
|
|
|
kind: productSpecificModule,
|
|
|
|
},
|
2017-11-08 08:03:48 +01:00
|
|
|
},
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"bin", "my_test"},
|
|
|
|
out: "target/product/test_device/product/bin/my_test",
|
|
|
|
partitionDir: "target/product/test_device/product",
|
2017-11-08 08:03:48 +01:00
|
|
|
},
|
2018-05-29 14:28:54 +02:00
|
|
|
{
|
2019-06-25 09:47:17 +02:00
|
|
|
name: "system_ext binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-12-31 03:43:07 +01:00
|
|
|
earlyModuleContext: earlyModuleContext{
|
|
|
|
kind: systemExtSpecificModule,
|
|
|
|
},
|
2018-05-29 14:28:54 +02:00
|
|
|
},
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"bin", "my_test"},
|
|
|
|
out: "target/product/test_device/system_ext/bin/my_test",
|
|
|
|
partitionDir: "target/product/test_device/system_ext",
|
2018-05-29 14:28:54 +02:00
|
|
|
},
|
2019-10-02 20:10:58 +02:00
|
|
|
{
|
|
|
|
name: "root binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-10-02 20:10:58 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-10-02 20:10:58 +02:00
|
|
|
},
|
|
|
|
inRoot: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"my_test"},
|
|
|
|
out: "target/product/test_device/root/my_test",
|
|
|
|
partitionDir: "target/product/test_device/root",
|
2019-10-02 20:10:58 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "recovery binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-10-02 20:10:58 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-10-02 20:10:58 +02:00
|
|
|
},
|
|
|
|
inRecovery: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"bin/my_test"},
|
|
|
|
out: "target/product/test_device/recovery/root/system/bin/my_test",
|
|
|
|
partitionDir: "target/product/test_device/recovery/root/system",
|
2019-10-02 20:10:58 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "recovery root binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-10-02 20:10:58 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-10-02 20:10:58 +02:00
|
|
|
},
|
|
|
|
inRecovery: true,
|
|
|
|
inRoot: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"my_test"},
|
|
|
|
out: "target/product/test_device/recovery/root/my_test",
|
|
|
|
partitionDir: "target/product/test_device/recovery/root",
|
2019-10-02 20:10:58 +02:00
|
|
|
},
|
2017-07-07 01:59:48 +02:00
|
|
|
|
2021-04-13 14:13:49 +02:00
|
|
|
{
|
|
|
|
name: "ramdisk binary",
|
|
|
|
ctx: &testModuleInstallPathContext{
|
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2021-04-13 14:13:49 +02:00
|
|
|
},
|
|
|
|
inRamdisk: true,
|
|
|
|
},
|
|
|
|
in: []string{"my_test"},
|
|
|
|
out: "target/product/test_device/ramdisk/system/my_test",
|
|
|
|
partitionDir: "target/product/test_device/ramdisk/system",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "ramdisk root binary",
|
|
|
|
ctx: &testModuleInstallPathContext{
|
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2021-04-13 14:13:49 +02:00
|
|
|
},
|
|
|
|
inRamdisk: true,
|
|
|
|
inRoot: true,
|
|
|
|
},
|
|
|
|
in: []string{"my_test"},
|
|
|
|
out: "target/product/test_device/ramdisk/my_test",
|
|
|
|
partitionDir: "target/product/test_device/ramdisk",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "vendor_ramdisk binary",
|
|
|
|
ctx: &testModuleInstallPathContext{
|
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2021-04-13 14:13:49 +02:00
|
|
|
},
|
|
|
|
inVendorRamdisk: true,
|
|
|
|
},
|
|
|
|
in: []string{"my_test"},
|
|
|
|
out: "target/product/test_device/vendor_ramdisk/system/my_test",
|
|
|
|
partitionDir: "target/product/test_device/vendor_ramdisk/system",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "vendor_ramdisk root binary",
|
|
|
|
ctx: &testModuleInstallPathContext{
|
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2021-04-13 14:13:49 +02:00
|
|
|
},
|
|
|
|
inVendorRamdisk: true,
|
|
|
|
inRoot: true,
|
|
|
|
},
|
|
|
|
in: []string{"my_test"},
|
|
|
|
out: "target/product/test_device/vendor_ramdisk/my_test",
|
|
|
|
partitionDir: "target/product/test_device/vendor_ramdisk",
|
|
|
|
},
|
2021-04-08 14:13:22 +02:00
|
|
|
{
|
|
|
|
name: "debug_ramdisk binary",
|
|
|
|
ctx: &testModuleInstallPathContext{
|
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2021-04-08 14:13:22 +02:00
|
|
|
},
|
|
|
|
inDebugRamdisk: true,
|
|
|
|
},
|
|
|
|
in: []string{"my_test"},
|
|
|
|
out: "target/product/test_device/debug_ramdisk/my_test",
|
|
|
|
partitionDir: "target/product/test_device/debug_ramdisk",
|
|
|
|
},
|
2017-07-07 01:59:48 +02:00
|
|
|
{
|
|
|
|
name: "system native test binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
|
|
|
inData: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"nativetest", "my_test"},
|
|
|
|
out: "target/product/test_device/data/nativetest/my_test",
|
|
|
|
partitionDir: "target/product/test_device/data",
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "vendor native test binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-12-31 03:43:07 +01:00
|
|
|
earlyModuleContext: earlyModuleContext{
|
|
|
|
kind: socSpecificModule,
|
|
|
|
},
|
2017-11-08 08:03:48 +01:00
|
|
|
},
|
|
|
|
inData: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"nativetest", "my_test"},
|
|
|
|
out: "target/product/test_device/data/nativetest/my_test",
|
|
|
|
partitionDir: "target/product/test_device/data",
|
2017-11-08 08:03:48 +01:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "odm native test binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-12-31 03:43:07 +01:00
|
|
|
earlyModuleContext: earlyModuleContext{
|
|
|
|
kind: deviceSpecificModule,
|
|
|
|
},
|
2017-11-08 08:03:48 +01:00
|
|
|
},
|
|
|
|
inData: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"nativetest", "my_test"},
|
|
|
|
out: "target/product/test_device/data/nativetest/my_test",
|
|
|
|
partitionDir: "target/product/test_device/data",
|
2017-11-08 08:03:48 +01:00
|
|
|
},
|
|
|
|
{
|
2018-01-10 11:00:15 +01:00
|
|
|
name: "product native test binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-12-31 03:43:07 +01:00
|
|
|
earlyModuleContext: earlyModuleContext{
|
|
|
|
kind: productSpecificModule,
|
|
|
|
},
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
|
|
|
inData: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"nativetest", "my_test"},
|
|
|
|
out: "target/product/test_device/data/nativetest/my_test",
|
|
|
|
partitionDir: "target/product/test_device/data",
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
|
|
|
|
2018-05-29 14:28:54 +02:00
|
|
|
{
|
2019-06-25 09:47:17 +02:00
|
|
|
name: "system_ext native test binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-12-31 03:43:07 +01:00
|
|
|
earlyModuleContext: earlyModuleContext{
|
|
|
|
kind: systemExtSpecificModule,
|
|
|
|
},
|
2018-05-29 14:28:54 +02:00
|
|
|
},
|
|
|
|
inData: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"nativetest", "my_test"},
|
|
|
|
out: "target/product/test_device/data/nativetest/my_test",
|
|
|
|
partitionDir: "target/product/test_device/data",
|
2018-05-29 14:28:54 +02:00
|
|
|
},
|
|
|
|
|
2017-07-07 01:59:48 +02:00
|
|
|
{
|
|
|
|
name: "sanitized system binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
|
|
|
inSanitizerDir: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"bin", "my_test"},
|
|
|
|
out: "target/product/test_device/data/asan/system/bin/my_test",
|
|
|
|
partitionDir: "target/product/test_device/data/asan/system",
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "sanitized vendor binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-12-31 03:43:07 +01:00
|
|
|
earlyModuleContext: earlyModuleContext{
|
|
|
|
kind: socSpecificModule,
|
|
|
|
},
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
|
|
|
inSanitizerDir: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"bin", "my_test"},
|
|
|
|
out: "target/product/test_device/data/asan/vendor/bin/my_test",
|
|
|
|
partitionDir: "target/product/test_device/data/asan/vendor",
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
2017-11-08 08:03:48 +01:00
|
|
|
{
|
|
|
|
name: "sanitized odm binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-12-31 03:43:07 +01:00
|
|
|
earlyModuleContext: earlyModuleContext{
|
|
|
|
kind: deviceSpecificModule,
|
|
|
|
},
|
2017-11-08 08:03:48 +01:00
|
|
|
},
|
|
|
|
inSanitizerDir: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"bin", "my_test"},
|
|
|
|
out: "target/product/test_device/data/asan/odm/bin/my_test",
|
|
|
|
partitionDir: "target/product/test_device/data/asan/odm",
|
2017-11-08 08:03:48 +01:00
|
|
|
},
|
|
|
|
{
|
2018-01-10 11:00:15 +01:00
|
|
|
name: "sanitized product binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-12-31 03:43:07 +01:00
|
|
|
earlyModuleContext: earlyModuleContext{
|
|
|
|
kind: productSpecificModule,
|
|
|
|
},
|
2017-11-08 08:03:48 +01:00
|
|
|
},
|
|
|
|
inSanitizerDir: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"bin", "my_test"},
|
|
|
|
out: "target/product/test_device/data/asan/product/bin/my_test",
|
|
|
|
partitionDir: "target/product/test_device/data/asan/product",
|
2017-11-08 08:03:48 +01:00
|
|
|
},
|
2017-07-07 01:59:48 +02:00
|
|
|
|
2018-05-29 14:28:54 +02:00
|
|
|
{
|
2019-06-25 09:47:17 +02:00
|
|
|
name: "sanitized system_ext binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-12-31 03:43:07 +01:00
|
|
|
earlyModuleContext: earlyModuleContext{
|
|
|
|
kind: systemExtSpecificModule,
|
|
|
|
},
|
2018-05-29 14:28:54 +02:00
|
|
|
},
|
|
|
|
inSanitizerDir: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"bin", "my_test"},
|
|
|
|
out: "target/product/test_device/data/asan/system_ext/bin/my_test",
|
|
|
|
partitionDir: "target/product/test_device/data/asan/system_ext",
|
2018-05-29 14:28:54 +02:00
|
|
|
},
|
|
|
|
|
2017-07-07 01:59:48 +02:00
|
|
|
{
|
|
|
|
name: "sanitized system native test binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
|
|
|
inData: true,
|
|
|
|
inSanitizerDir: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"nativetest", "my_test"},
|
|
|
|
out: "target/product/test_device/data/asan/data/nativetest/my_test",
|
|
|
|
partitionDir: "target/product/test_device/data/asan/data",
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "sanitized vendor native test binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-12-31 03:43:07 +01:00
|
|
|
earlyModuleContext: earlyModuleContext{
|
|
|
|
kind: socSpecificModule,
|
|
|
|
},
|
2017-11-08 08:03:48 +01:00
|
|
|
},
|
|
|
|
inData: true,
|
|
|
|
inSanitizerDir: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"nativetest", "my_test"},
|
|
|
|
out: "target/product/test_device/data/asan/data/nativetest/my_test",
|
|
|
|
partitionDir: "target/product/test_device/data/asan/data",
|
2017-11-08 08:03:48 +01:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "sanitized odm native test binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-12-31 03:43:07 +01:00
|
|
|
earlyModuleContext: earlyModuleContext{
|
|
|
|
kind: deviceSpecificModule,
|
|
|
|
},
|
2017-11-08 08:03:48 +01:00
|
|
|
},
|
|
|
|
inData: true,
|
|
|
|
inSanitizerDir: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"nativetest", "my_test"},
|
|
|
|
out: "target/product/test_device/data/asan/data/nativetest/my_test",
|
|
|
|
partitionDir: "target/product/test_device/data/asan/data",
|
2017-11-08 08:03:48 +01:00
|
|
|
},
|
|
|
|
{
|
2018-01-10 11:00:15 +01:00
|
|
|
name: "sanitized product native test binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-12-31 03:43:07 +01:00
|
|
|
earlyModuleContext: earlyModuleContext{
|
|
|
|
kind: productSpecificModule,
|
|
|
|
},
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
|
|
|
inData: true,
|
|
|
|
inSanitizerDir: true,
|
2018-05-29 14:28:54 +02:00
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"nativetest", "my_test"},
|
|
|
|
out: "target/product/test_device/data/asan/data/nativetest/my_test",
|
|
|
|
partitionDir: "target/product/test_device/data/asan/data",
|
2018-05-29 14:28:54 +02:00
|
|
|
},
|
|
|
|
{
|
2019-06-25 09:47:17 +02:00
|
|
|
name: "sanitized system_ext native test binary",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2019-06-06 23:33:29 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2019-12-31 03:43:07 +01:00
|
|
|
earlyModuleContext: earlyModuleContext{
|
|
|
|
kind: systemExtSpecificModule,
|
|
|
|
},
|
2018-05-29 14:28:54 +02:00
|
|
|
},
|
|
|
|
inData: true,
|
|
|
|
inSanitizerDir: true,
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"nativetest", "my_test"},
|
|
|
|
out: "target/product/test_device/data/asan/data/nativetest/my_test",
|
|
|
|
partitionDir: "target/product/test_device/data/asan/data",
|
2020-02-11 00:29:54 +01:00
|
|
|
}, {
|
|
|
|
name: "device testcases",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2020-02-11 00:29:54 +01:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2020-02-11 00:29:54 +01:00
|
|
|
},
|
|
|
|
inTestcases: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"my_test", "my_test_bin"},
|
|
|
|
out: "target/product/test_device/testcases/my_test/my_test_bin",
|
|
|
|
partitionDir: "target/product/test_device/testcases",
|
2020-02-11 00:29:54 +01:00
|
|
|
}, {
|
|
|
|
name: "host testcases",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2020-02-11 00:29:54 +01:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: hostTarget.Os,
|
|
|
|
target: hostTarget,
|
|
|
|
},
|
2020-02-11 00:29:54 +01:00
|
|
|
},
|
|
|
|
inTestcases: true,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"my_test", "my_test_bin"},
|
|
|
|
out: "host/linux-x86/testcases/my_test/my_test_bin",
|
|
|
|
partitionDir: "host/linux-x86/testcases",
|
2020-02-11 00:29:54 +01:00
|
|
|
}, {
|
|
|
|
name: "forced host testcases",
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx: &testModuleInstallPathContext{
|
2020-02-11 00:29:54 +01:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2020-02-11 00:29:54 +01:00
|
|
|
},
|
|
|
|
inTestcases: true,
|
|
|
|
forceOS: &Linux,
|
2020-09-01 05:37:45 +02:00
|
|
|
forceArch: &X86,
|
2020-02-11 00:29:54 +01:00
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
in: []string{"my_test", "my_test_bin"},
|
|
|
|
out: "host/linux-x86/testcases/my_test/my_test_bin",
|
|
|
|
partitionDir: "host/linux-x86/testcases",
|
2017-07-07 01:59:48 +02:00
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, tc := range testCases {
|
|
|
|
t.Run(tc.name, func(t *testing.T) {
|
2019-06-06 23:33:29 +02:00
|
|
|
tc.ctx.baseModuleContext.config = testConfig
|
2017-07-07 01:59:48 +02:00
|
|
|
output := PathForModuleInstall(tc.ctx, tc.in...)
|
|
|
|
if output.basePath.path != tc.out {
|
|
|
|
t.Errorf("unexpected path:\n got: %q\nwant: %q\n",
|
|
|
|
output.basePath.path,
|
|
|
|
tc.out)
|
|
|
|
}
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
if output.partitionDir != tc.partitionDir {
|
|
|
|
t.Errorf("unexpected partitionDir:\n got: %q\nwant: %q\n",
|
|
|
|
output.partitionDir, tc.partitionDir)
|
|
|
|
}
|
2017-07-07 01:59:48 +02:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
2017-11-03 23:20:35 +01:00
|
|
|
|
2021-04-13 14:13:49 +02:00
|
|
|
func TestPathForModuleInstallRecoveryAsBoot(t *testing.T) {
|
|
|
|
testConfig := pathTestConfig("")
|
|
|
|
testConfig.TestProductVariables.BoardUsesRecoveryAsBoot = proptools.BoolPtr(true)
|
|
|
|
testConfig.TestProductVariables.BoardMoveRecoveryResourcesToVendorBoot = proptools.BoolPtr(true)
|
|
|
|
deviceTarget := Target{Os: Android, Arch: Arch{ArchType: Arm64}}
|
|
|
|
|
|
|
|
testCases := []struct {
|
|
|
|
name string
|
|
|
|
ctx *testModuleInstallPathContext
|
|
|
|
in []string
|
|
|
|
out string
|
|
|
|
partitionDir string
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "ramdisk binary",
|
|
|
|
ctx: &testModuleInstallPathContext{
|
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2021-04-13 14:13:49 +02:00
|
|
|
},
|
|
|
|
inRamdisk: true,
|
|
|
|
inRoot: true,
|
|
|
|
},
|
|
|
|
in: []string{"my_test"},
|
|
|
|
out: "target/product/test_device/recovery/root/first_stage_ramdisk/my_test",
|
|
|
|
partitionDir: "target/product/test_device/recovery/root/first_stage_ramdisk",
|
|
|
|
},
|
|
|
|
|
|
|
|
{
|
|
|
|
name: "vendor_ramdisk binary",
|
|
|
|
ctx: &testModuleInstallPathContext{
|
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2021-04-13 14:13:49 +02:00
|
|
|
},
|
|
|
|
inVendorRamdisk: true,
|
|
|
|
inRoot: true,
|
|
|
|
},
|
|
|
|
in: []string{"my_test"},
|
|
|
|
out: "target/product/test_device/vendor_ramdisk/first_stage_ramdisk/my_test",
|
|
|
|
partitionDir: "target/product/test_device/vendor_ramdisk/first_stage_ramdisk",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, tc := range testCases {
|
|
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
|
|
tc.ctx.baseModuleContext.config = testConfig
|
|
|
|
output := PathForModuleInstall(tc.ctx, tc.in...)
|
|
|
|
if output.basePath.path != tc.out {
|
|
|
|
t.Errorf("unexpected path:\n got: %q\nwant: %q\n",
|
|
|
|
output.basePath.path,
|
|
|
|
tc.out)
|
|
|
|
}
|
|
|
|
if output.partitionDir != tc.partitionDir {
|
|
|
|
t.Errorf("unexpected partitionDir:\n got: %q\nwant: %q\n",
|
|
|
|
output.partitionDir, tc.partitionDir)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
func TestBaseDirForInstallPath(t *testing.T) {
|
|
|
|
testConfig := pathTestConfig("")
|
|
|
|
deviceTarget := Target{Os: Android, Arch: Arch{ArchType: Arm64}}
|
|
|
|
|
2020-10-14 12:29:07 +02:00
|
|
|
ctx := &testModuleInstallPathContext{
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
InstallPath keeps its partition dir
This change introduces the concept of partition dir for InstallPaths.
It's the path to the partition where the InstallPath is rooted at. For
example, it's out/soong/target/product/<device>/<partitoon> for paths
created for device modules. For host modules, it is defined as
out/soong/host/<host_os>-<host_arch>.
The partition dir is obtained using the new PartitionDir() function.
Another change is that a freshly created InstallPath (usually via
PathForModuleInstall) is the result of joining PartitionDir() and the
remaining path elements. For example, PathForModuleInstall(ctx, "foo",
"bar").Rel() now returns "foo/bar". Previously, that call returned the
relative path from config.buildDir() ("out/soong"). This change is in
line with the behavior of other path-creating functions like
PathForModuleSrc where Rel() returns the path relative to the
contextually determined path like the module source directory.
Notice that the Join() call to InstallPath doesn't change
PartitionDir(), while does change the result of Rel().
p := PathForModuleInstall(ctx, "foo", "bar")
p.PartitionDir() is out/soong/host/linux-x86
p.Rel() is foo/bar
q := p.Join(ctx, "baz")
q.PartitionDir() is still out/soong/host/linux-x86
q.Rel() now returns baz
Bug: N/A
Test: m nothing
Change-Id: I916bb1c782a4bfe0fbd4854e349cd2a2a42f56b6
2020-10-20 11:23:33 +02:00
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx.baseModuleContext.config = testConfig
|
|
|
|
|
|
|
|
actual := PathForModuleInstall(ctx, "foo", "bar")
|
|
|
|
expectedBaseDir := "target/product/test_device/system"
|
|
|
|
if actual.partitionDir != expectedBaseDir {
|
|
|
|
t.Errorf("unexpected partitionDir:\n got: %q\nwant: %q\n", actual.partitionDir, expectedBaseDir)
|
|
|
|
}
|
|
|
|
expectedRelPath := "foo/bar"
|
|
|
|
if actual.Rel() != expectedRelPath {
|
|
|
|
t.Errorf("unexpected Rel():\n got: %q\nwant: %q\n", actual.Rel(), expectedRelPath)
|
|
|
|
}
|
|
|
|
|
|
|
|
actualAfterJoin := actual.Join(ctx, "baz")
|
|
|
|
// partitionDir is preserved even after joining
|
|
|
|
if actualAfterJoin.partitionDir != expectedBaseDir {
|
|
|
|
t.Errorf("unexpected partitionDir after joining:\n got: %q\nwant: %q\n", actualAfterJoin.partitionDir, expectedBaseDir)
|
|
|
|
}
|
|
|
|
// Rel() is updated though
|
|
|
|
expectedRelAfterJoin := "baz"
|
|
|
|
if actualAfterJoin.Rel() != expectedRelAfterJoin {
|
|
|
|
t.Errorf("unexpected Rel() after joining:\n got: %q\nwant: %q\n", actualAfterJoin.Rel(), expectedRelAfterJoin)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-03 23:20:35 +01:00
|
|
|
func TestDirectorySortedPaths(t *testing.T) {
|
2019-12-14 05:41:13 +01:00
|
|
|
config := TestConfig("out", nil, "", map[string][]byte{
|
|
|
|
"Android.bp": nil,
|
|
|
|
"a.txt": nil,
|
|
|
|
"a/txt": nil,
|
|
|
|
"a/b/c": nil,
|
|
|
|
"a/b/d": nil,
|
|
|
|
"b": nil,
|
|
|
|
"b/b.txt": nil,
|
|
|
|
"a/a.txt": nil,
|
2019-03-05 21:46:40 +01:00
|
|
|
})
|
|
|
|
|
2019-12-14 05:41:13 +01:00
|
|
|
ctx := PathContextForTesting(config)
|
|
|
|
|
2017-11-03 23:20:35 +01:00
|
|
|
makePaths := func() Paths {
|
|
|
|
return Paths{
|
2019-03-05 21:46:40 +01:00
|
|
|
PathForSource(ctx, "a.txt"),
|
|
|
|
PathForSource(ctx, "a/txt"),
|
|
|
|
PathForSource(ctx, "a/b/c"),
|
|
|
|
PathForSource(ctx, "a/b/d"),
|
|
|
|
PathForSource(ctx, "b"),
|
|
|
|
PathForSource(ctx, "b/b.txt"),
|
|
|
|
PathForSource(ctx, "a/a.txt"),
|
2017-11-03 23:20:35 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
expected := []string{
|
|
|
|
"a.txt",
|
|
|
|
"a/a.txt",
|
|
|
|
"a/b/c",
|
|
|
|
"a/b/d",
|
|
|
|
"a/txt",
|
|
|
|
"b",
|
|
|
|
"b/b.txt",
|
|
|
|
}
|
|
|
|
|
|
|
|
paths := makePaths()
|
2018-04-17 19:52:26 +02:00
|
|
|
reversePaths := ReversePaths(paths)
|
2017-11-03 23:20:35 +01:00
|
|
|
|
|
|
|
sortedPaths := PathsToDirectorySortedPaths(paths)
|
|
|
|
reverseSortedPaths := PathsToDirectorySortedPaths(reversePaths)
|
|
|
|
|
|
|
|
if !reflect.DeepEqual(Paths(sortedPaths).Strings(), expected) {
|
|
|
|
t.Fatalf("sorted paths:\n %#v\n != \n %#v", paths.Strings(), expected)
|
|
|
|
}
|
|
|
|
|
|
|
|
if !reflect.DeepEqual(Paths(reverseSortedPaths).Strings(), expected) {
|
|
|
|
t.Fatalf("sorted reversed paths:\n %#v\n !=\n %#v", reversePaths.Strings(), expected)
|
|
|
|
}
|
|
|
|
|
|
|
|
expectedA := []string{
|
|
|
|
"a/a.txt",
|
|
|
|
"a/b/c",
|
|
|
|
"a/b/d",
|
|
|
|
"a/txt",
|
|
|
|
}
|
|
|
|
|
|
|
|
inA := sortedPaths.PathsInDirectory("a")
|
|
|
|
if !reflect.DeepEqual(inA.Strings(), expectedA) {
|
|
|
|
t.Errorf("FilesInDirectory(a):\n %#v\n != \n %#v", inA.Strings(), expectedA)
|
|
|
|
}
|
|
|
|
|
|
|
|
expectedA_B := []string{
|
|
|
|
"a/b/c",
|
|
|
|
"a/b/d",
|
|
|
|
}
|
|
|
|
|
|
|
|
inA_B := sortedPaths.PathsInDirectory("a/b")
|
|
|
|
if !reflect.DeepEqual(inA_B.Strings(), expectedA_B) {
|
|
|
|
t.Errorf("FilesInDirectory(a/b):\n %#v\n != \n %#v", inA_B.Strings(), expectedA_B)
|
|
|
|
}
|
|
|
|
|
|
|
|
expectedB := []string{
|
|
|
|
"b/b.txt",
|
|
|
|
}
|
|
|
|
|
|
|
|
inB := sortedPaths.PathsInDirectory("b")
|
|
|
|
if !reflect.DeepEqual(inB.Strings(), expectedB) {
|
|
|
|
t.Errorf("FilesInDirectory(b):\n %#v\n != \n %#v", inA.Strings(), expectedA)
|
|
|
|
}
|
|
|
|
}
|
2018-11-12 19:13:39 +01:00
|
|
|
|
|
|
|
func TestMaybeRel(t *testing.T) {
|
|
|
|
testCases := []struct {
|
|
|
|
name string
|
|
|
|
base string
|
|
|
|
target string
|
|
|
|
out string
|
|
|
|
isRel bool
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "normal",
|
|
|
|
base: "a/b/c",
|
|
|
|
target: "a/b/c/d",
|
|
|
|
out: "d",
|
|
|
|
isRel: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "parent",
|
|
|
|
base: "a/b/c/d",
|
|
|
|
target: "a/b/c",
|
|
|
|
isRel: false,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "not relative",
|
|
|
|
base: "a/b",
|
|
|
|
target: "c/d",
|
|
|
|
isRel: false,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "abs1",
|
|
|
|
base: "/a",
|
|
|
|
target: "a",
|
|
|
|
isRel: false,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "abs2",
|
|
|
|
base: "a",
|
|
|
|
target: "/a",
|
|
|
|
isRel: false,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, testCase := range testCases {
|
|
|
|
t.Run(testCase.name, func(t *testing.T) {
|
|
|
|
ctx := &configErrorWrapper{}
|
|
|
|
out, isRel := MaybeRel(ctx, testCase.base, testCase.target)
|
|
|
|
if len(ctx.errors) > 0 {
|
|
|
|
t.Errorf("MaybeRel(..., %s, %s) reported unexpected errors %v",
|
|
|
|
testCase.base, testCase.target, ctx.errors)
|
|
|
|
}
|
|
|
|
if isRel != testCase.isRel || out != testCase.out {
|
|
|
|
t.Errorf("MaybeRel(..., %s, %s) want %v, %v got %v, %v",
|
|
|
|
testCase.base, testCase.target, testCase.out, testCase.isRel, out, isRel)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
2019-01-24 22:14:39 +01:00
|
|
|
|
|
|
|
func TestPathForSource(t *testing.T) {
|
|
|
|
testCases := []struct {
|
|
|
|
name string
|
|
|
|
buildDir string
|
|
|
|
src string
|
|
|
|
err string
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "normal",
|
|
|
|
buildDir: "out",
|
|
|
|
src: "a/b/c",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "abs",
|
|
|
|
buildDir: "out",
|
|
|
|
src: "/a/b/c",
|
|
|
|
err: "is outside directory",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "in out dir",
|
|
|
|
buildDir: "out",
|
2021-11-09 21:34:39 +01:00
|
|
|
src: "out/soong/a/b/c",
|
2019-01-24 22:14:39 +01:00
|
|
|
err: "is in output",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
funcs := []struct {
|
|
|
|
name string
|
|
|
|
f func(ctx PathContext, pathComponents ...string) (SourcePath, error)
|
|
|
|
}{
|
|
|
|
{"pathForSource", pathForSource},
|
|
|
|
{"safePathForSource", safePathForSource},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, f := range funcs {
|
|
|
|
t.Run(f.name, func(t *testing.T) {
|
|
|
|
for _, test := range testCases {
|
|
|
|
t.Run(test.name, func(t *testing.T) {
|
2019-12-14 05:41:13 +01:00
|
|
|
testConfig := pathTestConfig(test.buildDir)
|
2019-01-24 22:14:39 +01:00
|
|
|
ctx := &configErrorWrapper{config: testConfig}
|
|
|
|
_, err := f.f(ctx, test.src)
|
|
|
|
if len(ctx.errors) > 0 {
|
|
|
|
t.Fatalf("unexpected errors %v", ctx.errors)
|
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
if test.err == "" {
|
|
|
|
t.Fatalf("unexpected error %q", err.Error())
|
|
|
|
} else if !strings.Contains(err.Error(), test.err) {
|
|
|
|
t.Fatalf("incorrect error, want substring %q got %q", test.err, err.Error())
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if test.err != "" {
|
|
|
|
t.Fatalf("missing error %q", test.err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
2019-02-11 23:14:16 +01:00
|
|
|
|
2019-03-06 07:25:09 +01:00
|
|
|
type pathForModuleSrcTestModule struct {
|
2019-03-06 19:17:32 +01:00
|
|
|
ModuleBase
|
|
|
|
props struct {
|
|
|
|
Srcs []string `android:"path"`
|
|
|
|
Exclude_srcs []string `android:"path"`
|
2019-03-06 07:25:09 +01:00
|
|
|
|
|
|
|
Src *string `android:"path"`
|
2019-03-18 20:12:48 +01:00
|
|
|
|
|
|
|
Module_handles_missing_deps bool
|
2019-03-06 19:17:32 +01:00
|
|
|
}
|
|
|
|
|
2019-03-06 07:25:09 +01:00
|
|
|
src string
|
|
|
|
rel string
|
|
|
|
|
|
|
|
srcs []string
|
2019-03-06 19:17:32 +01:00
|
|
|
rels []string
|
2019-03-06 07:25:09 +01:00
|
|
|
|
|
|
|
missingDeps []string
|
2019-03-06 19:17:32 +01:00
|
|
|
}
|
|
|
|
|
2019-03-06 07:25:09 +01:00
|
|
|
func pathForModuleSrcTestModuleFactory() Module {
|
|
|
|
module := &pathForModuleSrcTestModule{}
|
2019-03-06 19:17:32 +01:00
|
|
|
module.AddProperties(&module.props)
|
|
|
|
InitAndroidModule(module)
|
|
|
|
return module
|
|
|
|
}
|
|
|
|
|
2019-03-06 07:25:09 +01:00
|
|
|
func (p *pathForModuleSrcTestModule) GenerateAndroidBuildActions(ctx ModuleContext) {
|
2019-03-18 20:12:48 +01:00
|
|
|
var srcs Paths
|
|
|
|
if p.props.Module_handles_missing_deps {
|
|
|
|
srcs, p.missingDeps = PathsAndMissingDepsForModuleSrcExcludes(ctx, p.props.Srcs, p.props.Exclude_srcs)
|
|
|
|
} else {
|
|
|
|
srcs = PathsForModuleSrcExcludes(ctx, p.props.Srcs, p.props.Exclude_srcs)
|
|
|
|
}
|
2019-03-06 07:25:09 +01:00
|
|
|
p.srcs = srcs.Strings()
|
2019-03-06 19:17:32 +01:00
|
|
|
|
2019-03-06 07:25:09 +01:00
|
|
|
for _, src := range srcs {
|
2019-03-06 19:17:32 +01:00
|
|
|
p.rels = append(p.rels, src.Rel())
|
|
|
|
}
|
2019-03-06 07:25:09 +01:00
|
|
|
|
|
|
|
if p.props.Src != nil {
|
|
|
|
src := PathForModuleSrc(ctx, *p.props.Src)
|
|
|
|
if src != nil {
|
|
|
|
p.src = src.String()
|
|
|
|
p.rel = src.Rel()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-18 20:12:48 +01:00
|
|
|
if !p.props.Module_handles_missing_deps {
|
|
|
|
p.missingDeps = ctx.GetMissingDependencies()
|
|
|
|
}
|
2019-06-07 00:41:36 +02:00
|
|
|
|
|
|
|
ctx.Build(pctx, BuildParams{
|
|
|
|
Rule: Touch,
|
|
|
|
Output: PathForModuleOut(ctx, "output"),
|
|
|
|
})
|
2019-03-06 19:17:32 +01:00
|
|
|
}
|
|
|
|
|
2019-05-29 23:40:35 +02:00
|
|
|
type pathForModuleSrcOutputFileProviderModule struct {
|
|
|
|
ModuleBase
|
|
|
|
props struct {
|
|
|
|
Outs []string
|
|
|
|
Tagged []string
|
|
|
|
}
|
|
|
|
|
|
|
|
outs Paths
|
|
|
|
tagged Paths
|
|
|
|
}
|
|
|
|
|
|
|
|
func pathForModuleSrcOutputFileProviderModuleFactory() Module {
|
|
|
|
module := &pathForModuleSrcOutputFileProviderModule{}
|
|
|
|
module.AddProperties(&module.props)
|
|
|
|
InitAndroidModule(module)
|
|
|
|
return module
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p *pathForModuleSrcOutputFileProviderModule) GenerateAndroidBuildActions(ctx ModuleContext) {
|
|
|
|
for _, out := range p.props.Outs {
|
|
|
|
p.outs = append(p.outs, PathForModuleOut(ctx, out))
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, tagged := range p.props.Tagged {
|
|
|
|
p.tagged = append(p.tagged, PathForModuleOut(ctx, tagged))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p *pathForModuleSrcOutputFileProviderModule) OutputFiles(tag string) (Paths, error) {
|
|
|
|
switch tag {
|
|
|
|
case "":
|
|
|
|
return p.outs, nil
|
|
|
|
case ".tagged":
|
|
|
|
return p.tagged, nil
|
|
|
|
default:
|
|
|
|
return nil, fmt.Errorf("unsupported tag %q", tag)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-06 07:25:09 +01:00
|
|
|
type pathForModuleSrcTestCase struct {
|
|
|
|
name string
|
|
|
|
bp string
|
|
|
|
srcs []string
|
|
|
|
rels []string
|
|
|
|
src string
|
|
|
|
rel string
|
2021-07-09 17:56:15 +02:00
|
|
|
|
|
|
|
// Make test specific preparations to the test fixture.
|
|
|
|
preparer FixturePreparer
|
|
|
|
|
|
|
|
// A test specific error handler.
|
|
|
|
errorHandler FixtureErrorHandler
|
2019-03-06 07:25:09 +01:00
|
|
|
}
|
|
|
|
|
2021-03-16 22:11:42 +01:00
|
|
|
func testPathForModuleSrc(t *testing.T, tests []pathForModuleSrcTestCase) {
|
2019-03-06 07:25:09 +01:00
|
|
|
for _, test := range tests {
|
|
|
|
t.Run(test.name, func(t *testing.T) {
|
|
|
|
fgBp := `
|
|
|
|
filegroup {
|
|
|
|
name: "a",
|
|
|
|
srcs: ["src/a"],
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
2019-05-29 23:40:35 +02:00
|
|
|
ofpBp := `
|
|
|
|
output_file_provider {
|
|
|
|
name: "b",
|
|
|
|
outs: ["gen/b"],
|
|
|
|
tagged: ["gen/c"],
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
2021-03-16 22:11:42 +01:00
|
|
|
mockFS := MockFS{
|
2019-03-06 07:25:09 +01:00
|
|
|
"fg/Android.bp": []byte(fgBp),
|
|
|
|
"foo/Android.bp": []byte(test.bp),
|
2019-05-29 23:40:35 +02:00
|
|
|
"ofp/Android.bp": []byte(ofpBp),
|
2019-03-06 07:25:09 +01:00
|
|
|
"fg/src/a": nil,
|
|
|
|
"foo/src/b": nil,
|
|
|
|
"foo/src/c": nil,
|
|
|
|
"foo/src/d": nil,
|
|
|
|
"foo/src/e/e": nil,
|
|
|
|
"foo/src_special/$": nil,
|
|
|
|
}
|
|
|
|
|
2021-07-09 17:56:15 +02:00
|
|
|
errorHandler := test.errorHandler
|
|
|
|
if errorHandler == nil {
|
|
|
|
errorHandler = FixtureExpectsNoErrors
|
|
|
|
}
|
|
|
|
|
2021-03-20 01:36:14 +01:00
|
|
|
result := GroupFixturePreparers(
|
2021-03-16 22:11:42 +01:00
|
|
|
FixtureRegisterWithContext(func(ctx RegistrationContext) {
|
|
|
|
ctx.RegisterModuleType("test", pathForModuleSrcTestModuleFactory)
|
|
|
|
ctx.RegisterModuleType("output_file_provider", pathForModuleSrcOutputFileProviderModuleFactory)
|
|
|
|
}),
|
2021-07-09 17:56:15 +02:00
|
|
|
PrepareForTestWithFilegroup,
|
|
|
|
PrepareForTestWithNamespace,
|
2021-03-16 22:11:42 +01:00
|
|
|
mockFS.AddToFixture(),
|
2021-07-09 17:56:15 +02:00
|
|
|
OptionalFixturePreparer(test.preparer),
|
|
|
|
).
|
|
|
|
ExtendWithErrorHandler(errorHandler).
|
|
|
|
RunTest(t)
|
2021-03-16 22:11:42 +01:00
|
|
|
|
|
|
|
m := result.ModuleForTests("foo", "").Module().(*pathForModuleSrcTestModule)
|
|
|
|
|
|
|
|
AssertStringPathsRelativeToTopEquals(t, "srcs", result.Config, test.srcs, m.srcs)
|
|
|
|
AssertStringPathsRelativeToTopEquals(t, "rels", result.Config, test.rels, m.rels)
|
|
|
|
AssertStringPathRelativeToTopEquals(t, "src", result.Config, test.src, m.src)
|
|
|
|
AssertStringPathRelativeToTopEquals(t, "rel", result.Config, test.rel, m.rel)
|
2019-03-06 07:25:09 +01:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestPathsForModuleSrc(t *testing.T) {
|
|
|
|
tests := []pathForModuleSrcTestCase{
|
2019-03-06 19:17:32 +01:00
|
|
|
{
|
|
|
|
name: "path",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
srcs: ["src/b"],
|
|
|
|
}`,
|
|
|
|
srcs: []string{"foo/src/b"},
|
|
|
|
rels: []string{"src/b"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "glob",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
srcs: [
|
|
|
|
"src/*",
|
|
|
|
"src/e/*",
|
|
|
|
],
|
|
|
|
}`,
|
|
|
|
srcs: []string{"foo/src/b", "foo/src/c", "foo/src/d", "foo/src/e/e"},
|
|
|
|
rels: []string{"src/b", "src/c", "src/d", "src/e/e"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "recursive glob",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
srcs: ["src/**/*"],
|
|
|
|
}`,
|
|
|
|
srcs: []string{"foo/src/b", "foo/src/c", "foo/src/d", "foo/src/e/e"},
|
|
|
|
rels: []string{"src/b", "src/c", "src/d", "src/e/e"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "filegroup",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
srcs: [":a"],
|
|
|
|
}`,
|
|
|
|
srcs: []string{"fg/src/a"},
|
|
|
|
rels: []string{"src/a"},
|
|
|
|
},
|
2019-05-29 23:40:35 +02:00
|
|
|
{
|
|
|
|
name: "output file provider",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
srcs: [":b"],
|
|
|
|
}`,
|
2021-03-16 22:11:42 +01:00
|
|
|
srcs: []string{"out/soong/.intermediates/ofp/b/gen/b"},
|
2019-05-29 23:40:35 +02:00
|
|
|
rels: []string{"gen/b"},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "output file provider tagged",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
srcs: [":b{.tagged}"],
|
|
|
|
}`,
|
2021-03-16 22:11:42 +01:00
|
|
|
srcs: []string{"out/soong/.intermediates/ofp/b/gen/c"},
|
2019-05-29 23:40:35 +02:00
|
|
|
rels: []string{"gen/c"},
|
|
|
|
},
|
2020-07-05 03:23:14 +02:00
|
|
|
{
|
|
|
|
name: "output file provider with exclude",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
srcs: [":b", ":c"],
|
|
|
|
exclude_srcs: [":c"]
|
|
|
|
}
|
|
|
|
output_file_provider {
|
|
|
|
name: "c",
|
|
|
|
outs: ["gen/c"],
|
|
|
|
}`,
|
2021-03-16 22:11:42 +01:00
|
|
|
srcs: []string{"out/soong/.intermediates/ofp/b/gen/b"},
|
2020-07-05 03:23:14 +02:00
|
|
|
rels: []string{"gen/b"},
|
|
|
|
},
|
2019-03-06 19:17:32 +01:00
|
|
|
{
|
|
|
|
name: "special characters glob",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
srcs: ["src_special/*"],
|
|
|
|
}`,
|
|
|
|
srcs: []string{"foo/src_special/$"},
|
|
|
|
rels: []string{"src_special/$"},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2021-03-16 22:11:42 +01:00
|
|
|
testPathForModuleSrc(t, tests)
|
2019-05-29 23:40:35 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestPathForModuleSrc(t *testing.T) {
|
2019-03-06 07:25:09 +01:00
|
|
|
tests := []pathForModuleSrcTestCase{
|
|
|
|
{
|
|
|
|
name: "path",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
src: "src/b",
|
|
|
|
}`,
|
|
|
|
src: "foo/src/b",
|
|
|
|
rel: "src/b",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "glob",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
src: "src/e/*",
|
|
|
|
}`,
|
|
|
|
src: "foo/src/e/e",
|
|
|
|
rel: "src/e/e",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "filegroup",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
src: ":a",
|
|
|
|
}`,
|
|
|
|
src: "fg/src/a",
|
|
|
|
rel: "src/a",
|
|
|
|
},
|
2019-05-29 23:40:35 +02:00
|
|
|
{
|
|
|
|
name: "output file provider",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
src: ":b",
|
|
|
|
}`,
|
2021-03-16 22:11:42 +01:00
|
|
|
src: "out/soong/.intermediates/ofp/b/gen/b",
|
2019-05-29 23:40:35 +02:00
|
|
|
rel: "gen/b",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "output file provider tagged",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
src: ":b{.tagged}",
|
|
|
|
}`,
|
2021-03-16 22:11:42 +01:00
|
|
|
src: "out/soong/.intermediates/ofp/b/gen/c",
|
2019-05-29 23:40:35 +02:00
|
|
|
rel: "gen/c",
|
|
|
|
},
|
2019-03-06 07:25:09 +01:00
|
|
|
{
|
|
|
|
name: "special characters glob",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
src: "src_special/*",
|
|
|
|
}`,
|
|
|
|
src: "foo/src_special/$",
|
|
|
|
rel: "src_special/$",
|
|
|
|
},
|
2021-07-09 17:56:15 +02:00
|
|
|
{
|
|
|
|
// This test makes sure that an unqualified module name cannot contain characters that make
|
|
|
|
// it appear as a qualified module name.
|
|
|
|
name: "output file provider, invalid fully qualified name",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
src: "://other:b",
|
|
|
|
srcs: ["://other:c"],
|
|
|
|
}`,
|
|
|
|
preparer: FixtureAddTextFile("other/Android.bp", `
|
|
|
|
soong_namespace {}
|
|
|
|
|
|
|
|
output_file_provider {
|
|
|
|
name: "b",
|
|
|
|
outs: ["gen/b"],
|
|
|
|
}
|
|
|
|
|
|
|
|
output_file_provider {
|
|
|
|
name: "c",
|
|
|
|
outs: ["gen/c"],
|
|
|
|
}
|
|
|
|
`),
|
2021-07-12 21:12:12 +02:00
|
|
|
src: "foo/:/other:b",
|
|
|
|
rel: ":/other:b",
|
|
|
|
srcs: []string{"foo/:/other:c"},
|
|
|
|
rels: []string{":/other:c"},
|
2021-07-09 17:56:15 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "output file provider, missing fully qualified name",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
src: "//other:b",
|
|
|
|
srcs: ["//other:c"],
|
|
|
|
}`,
|
|
|
|
errorHandler: FixtureExpectsAllErrorsToMatchAPattern([]string{
|
2021-07-12 21:12:12 +02:00
|
|
|
`"foo" depends on undefined module "//other:b"`,
|
|
|
|
`"foo" depends on undefined module "//other:c"`,
|
2021-07-09 17:56:15 +02:00
|
|
|
}),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "output file provider, fully qualified name",
|
|
|
|
bp: `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
src: "//other:b",
|
|
|
|
srcs: ["//other:c"],
|
|
|
|
}`,
|
2021-07-09 18:10:35 +02:00
|
|
|
src: "out/soong/.intermediates/other/b/gen/b",
|
|
|
|
rel: "gen/b",
|
|
|
|
srcs: []string{"out/soong/.intermediates/other/c/gen/c"},
|
|
|
|
rels: []string{"gen/c"},
|
2021-07-09 17:56:15 +02:00
|
|
|
preparer: FixtureAddTextFile("other/Android.bp", `
|
|
|
|
soong_namespace {}
|
|
|
|
|
|
|
|
output_file_provider {
|
|
|
|
name: "b",
|
|
|
|
outs: ["gen/b"],
|
|
|
|
}
|
|
|
|
|
|
|
|
output_file_provider {
|
|
|
|
name: "c",
|
|
|
|
outs: ["gen/c"],
|
|
|
|
}
|
|
|
|
`),
|
|
|
|
},
|
2019-03-06 07:25:09 +01:00
|
|
|
}
|
|
|
|
|
2021-03-16 22:11:42 +01:00
|
|
|
testPathForModuleSrc(t, tests)
|
2019-03-06 07:25:09 +01:00
|
|
|
}
|
2019-03-06 19:17:32 +01:00
|
|
|
|
2019-03-06 07:25:09 +01:00
|
|
|
func TestPathsForModuleSrc_AllowMissingDependencies(t *testing.T) {
|
|
|
|
bp := `
|
|
|
|
test {
|
|
|
|
name: "foo",
|
|
|
|
srcs: [":a"],
|
|
|
|
exclude_srcs: [":b"],
|
|
|
|
src: ":c",
|
|
|
|
}
|
2019-03-18 20:12:48 +01:00
|
|
|
|
|
|
|
test {
|
|
|
|
name: "bar",
|
|
|
|
srcs: [":d"],
|
|
|
|
exclude_srcs: [":e"],
|
|
|
|
module_handles_missing_deps: true,
|
|
|
|
}
|
2019-03-06 07:25:09 +01:00
|
|
|
`
|
2019-03-06 19:17:32 +01:00
|
|
|
|
2021-03-20 01:36:14 +01:00
|
|
|
result := GroupFixturePreparers(
|
2021-03-16 22:11:42 +01:00
|
|
|
PrepareForTestWithAllowMissingDependencies,
|
|
|
|
FixtureRegisterWithContext(func(ctx RegistrationContext) {
|
|
|
|
ctx.RegisterModuleType("test", pathForModuleSrcTestModuleFactory)
|
|
|
|
}),
|
|
|
|
FixtureWithRootAndroidBp(bp),
|
2021-03-20 01:36:14 +01:00
|
|
|
).RunTest(t)
|
2019-03-06 07:25:09 +01:00
|
|
|
|
2021-03-16 22:11:42 +01:00
|
|
|
foo := result.ModuleForTests("foo", "").Module().(*pathForModuleSrcTestModule)
|
2019-03-06 07:25:09 +01:00
|
|
|
|
2021-03-16 22:11:42 +01:00
|
|
|
AssertArrayString(t, "foo missing deps", []string{"a", "b", "c"}, foo.missingDeps)
|
|
|
|
AssertArrayString(t, "foo srcs", []string{}, foo.srcs)
|
|
|
|
AssertStringEquals(t, "foo src", "", foo.src)
|
2019-03-18 20:12:48 +01:00
|
|
|
|
2021-03-16 22:11:42 +01:00
|
|
|
bar := result.ModuleForTests("bar", "").Module().(*pathForModuleSrcTestModule)
|
2019-03-18 20:12:48 +01:00
|
|
|
|
2021-03-16 22:11:42 +01:00
|
|
|
AssertArrayString(t, "bar missing deps", []string{"d", "e"}, bar.missingDeps)
|
|
|
|
AssertArrayString(t, "bar srcs", []string{}, bar.srcs)
|
2019-03-06 19:17:32 +01:00
|
|
|
}
|
|
|
|
|
2021-03-16 02:21:34 +01:00
|
|
|
func TestPathRelativeToTop(t *testing.T) {
|
|
|
|
testConfig := pathTestConfig("/tmp/build/top")
|
|
|
|
deviceTarget := Target{Os: Android, Arch: Arch{ArchType: Arm64}}
|
|
|
|
|
|
|
|
ctx := &testModuleInstallPathContext{
|
|
|
|
baseModuleContext: baseModuleContext{
|
2024-01-18 23:30:22 +01:00
|
|
|
archModuleContext: archModuleContext{
|
|
|
|
os: deviceTarget.Os,
|
|
|
|
target: deviceTarget,
|
|
|
|
},
|
2021-03-16 02:21:34 +01:00
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx.baseModuleContext.config = testConfig
|
|
|
|
|
|
|
|
t.Run("install for soong", func(t *testing.T) {
|
|
|
|
p := PathForModuleInstall(ctx, "install/path")
|
|
|
|
AssertPathRelativeToTopEquals(t, "install path for soong", "out/soong/target/product/test_device/system/install/path", p)
|
|
|
|
})
|
|
|
|
t.Run("install for make", func(t *testing.T) {
|
2021-11-12 03:59:15 +01:00
|
|
|
p := PathForModuleInstall(ctx, "install/path")
|
|
|
|
p.makePath = true
|
2021-03-16 02:21:34 +01:00
|
|
|
AssertPathRelativeToTopEquals(t, "install path for make", "out/target/product/test_device/system/install/path", p)
|
|
|
|
})
|
|
|
|
t.Run("output", func(t *testing.T) {
|
|
|
|
p := PathForOutput(ctx, "output/path")
|
|
|
|
AssertPathRelativeToTopEquals(t, "output path", "out/soong/output/path", p)
|
|
|
|
})
|
|
|
|
t.Run("source", func(t *testing.T) {
|
|
|
|
p := PathForSource(ctx, "source/path")
|
|
|
|
AssertPathRelativeToTopEquals(t, "source path", "source/path", p)
|
|
|
|
})
|
|
|
|
t.Run("mixture", func(t *testing.T) {
|
|
|
|
paths := Paths{
|
|
|
|
PathForModuleInstall(ctx, "install/path"),
|
|
|
|
PathForOutput(ctx, "output/path"),
|
|
|
|
PathForSource(ctx, "source/path"),
|
|
|
|
}
|
|
|
|
|
|
|
|
expected := []string{
|
|
|
|
"out/soong/target/product/test_device/system/install/path",
|
|
|
|
"out/soong/output/path",
|
|
|
|
"source/path",
|
|
|
|
}
|
|
|
|
AssertPathsRelativeToTopEquals(t, "mixture", expected, paths)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2019-02-11 23:14:16 +01:00
|
|
|
func ExampleOutputPath_ReplaceExtension() {
|
|
|
|
ctx := &configErrorWrapper{
|
2019-12-14 05:41:13 +01:00
|
|
|
config: TestConfig("out", nil, "", nil),
|
2019-02-11 23:14:16 +01:00
|
|
|
}
|
2019-02-25 19:25:24 +01:00
|
|
|
p := PathForOutput(ctx, "system/framework").Join(ctx, "boot.art")
|
2019-02-11 23:14:16 +01:00
|
|
|
p2 := p.ReplaceExtension(ctx, "oat")
|
|
|
|
fmt.Println(p, p2)
|
2019-02-25 19:25:24 +01:00
|
|
|
fmt.Println(p.Rel(), p2.Rel())
|
2019-02-11 23:14:16 +01:00
|
|
|
|
|
|
|
// Output:
|
2021-11-09 21:34:39 +01:00
|
|
|
// out/soong/system/framework/boot.art out/soong/system/framework/boot.oat
|
2019-02-25 19:25:24 +01:00
|
|
|
// boot.art boot.oat
|
2019-02-11 23:14:16 +01:00
|
|
|
}
|
2019-02-15 20:08:35 +01:00
|
|
|
|
2020-10-10 04:26:32 +02:00
|
|
|
func ExampleOutputPath_InSameDir() {
|
2019-02-15 20:08:35 +01:00
|
|
|
ctx := &configErrorWrapper{
|
2019-12-14 05:41:13 +01:00
|
|
|
config: TestConfig("out", nil, "", nil),
|
2019-02-15 20:08:35 +01:00
|
|
|
}
|
2019-02-25 19:25:24 +01:00
|
|
|
p := PathForOutput(ctx, "system/framework").Join(ctx, "boot.art")
|
2019-02-15 20:08:35 +01:00
|
|
|
p2 := p.InSameDir(ctx, "oat", "arm", "boot.vdex")
|
|
|
|
fmt.Println(p, p2)
|
2019-02-25 19:25:24 +01:00
|
|
|
fmt.Println(p.Rel(), p2.Rel())
|
2019-02-15 20:08:35 +01:00
|
|
|
|
|
|
|
// Output:
|
2021-11-09 21:34:39 +01:00
|
|
|
// out/soong/system/framework/boot.art out/soong/system/framework/oat/arm/boot.vdex
|
2019-02-25 19:25:24 +01:00
|
|
|
// boot.art oat/arm/boot.vdex
|
2019-02-15 20:08:35 +01:00
|
|
|
}
|
2020-02-29 00:34:17 +01:00
|
|
|
|
|
|
|
func BenchmarkFirstUniquePaths(b *testing.B) {
|
|
|
|
implementations := []struct {
|
|
|
|
name string
|
|
|
|
f func(Paths) Paths
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "list",
|
|
|
|
f: firstUniquePathsList,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "map",
|
|
|
|
f: firstUniquePathsMap,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
const maxSize = 1024
|
|
|
|
uniquePaths := make(Paths, maxSize)
|
|
|
|
for i := range uniquePaths {
|
|
|
|
uniquePaths[i] = PathForTesting(strconv.Itoa(i))
|
|
|
|
}
|
|
|
|
samePath := make(Paths, maxSize)
|
|
|
|
for i := range samePath {
|
|
|
|
samePath[i] = uniquePaths[0]
|
|
|
|
}
|
|
|
|
|
|
|
|
f := func(b *testing.B, imp func(Paths) Paths, paths Paths) {
|
|
|
|
for i := 0; i < b.N; i++ {
|
|
|
|
b.ReportAllocs()
|
|
|
|
paths = append(Paths(nil), paths...)
|
|
|
|
imp(paths)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for n := 1; n <= maxSize; n <<= 1 {
|
|
|
|
b.Run(strconv.Itoa(n), func(b *testing.B) {
|
|
|
|
for _, implementation := range implementations {
|
|
|
|
b.Run(implementation.name, func(b *testing.B) {
|
|
|
|
b.Run("same", func(b *testing.B) {
|
|
|
|
f(b, implementation.f, samePath[:n])
|
|
|
|
})
|
|
|
|
b.Run("unique", func(b *testing.B) {
|
|
|
|
f(b, implementation.f, uniquePaths[:n])
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|