Merge "Add a filename to anchor links in build docs."
diff --git a/android/paths.go b/android/paths.go
index 3366db1..afde55e 100644
--- a/android/paths.go
+++ b/android/paths.go
@@ -712,7 +712,7 @@
reportPathErrorf(ctx, "extension %q cannot contain /", ext)
}
ret := PathForOutput(ctx, pathtools.ReplaceExtension(p.path, ext))
- ret.rel = p.rel
+ ret.rel = pathtools.ReplaceExtension(p.rel, ext)
return ret
}
@@ -724,7 +724,7 @@
}
ret := PathForOutput(ctx, filepath.Dir(p.path), path)
- ret.rel = p.rel
+ ret.rel = filepath.Join(filepath.Dir(p.rel), path)
return ret
}
diff --git a/android/paths_test.go b/android/paths_test.go
index 3b6d2ec..20a00a0 100644
--- a/android/paths_test.go
+++ b/android/paths_test.go
@@ -696,22 +696,26 @@
ctx := &configErrorWrapper{
config: TestConfig("out", nil),
}
- p := PathForOutput(ctx, "system/framework/boot.art")
+ p := PathForOutput(ctx, "system/framework").Join(ctx, "boot.art")
p2 := p.ReplaceExtension(ctx, "oat")
fmt.Println(p, p2)
+ fmt.Println(p.Rel(), p2.Rel())
// Output:
// out/system/framework/boot.art out/system/framework/boot.oat
+ // boot.art boot.oat
}
func ExampleOutputPath_FileInSameDir() {
ctx := &configErrorWrapper{
config: TestConfig("out", nil),
}
- p := PathForOutput(ctx, "system/framework/boot.art")
+ p := PathForOutput(ctx, "system/framework").Join(ctx, "boot.art")
p2 := p.InSameDir(ctx, "oat", "arm", "boot.vdex")
fmt.Println(p, p2)
+ fmt.Println(p.Rel(), p2.Rel())
// Output:
// out/system/framework/boot.art out/system/framework/oat/arm/boot.vdex
+ // boot.art oat/arm/boot.vdex
}
diff --git a/android/prebuilt_etc.go b/android/prebuilt_etc.go
index a047e47..c58cc4f 100644
--- a/android/prebuilt_etc.go
+++ b/android/prebuilt_etc.go
@@ -26,6 +26,7 @@
RegisterModuleType("prebuilt_etc", PrebuiltEtcFactory)
RegisterModuleType("prebuilt_etc_host", PrebuiltEtcHostFactory)
RegisterModuleType("prebuilt_usr_share", PrebuiltUserShareFactory)
+ RegisterModuleType("prebuilt_usr_share_host", PrebuiltUserShareHostFactory)
PreDepsMutators(func(ctx RegisterMutatorsContext) {
ctx.BottomUp("prebuilt_etc", prebuiltEtcMutator).Parallel()
@@ -202,6 +203,15 @@
return module
}
+// prebuild_usr_share_host is for host prebuilts that will be installed to <partition>/usr/share/<subdir>
+func PrebuiltUserShareHostFactory() Module {
+ module := &PrebuiltEtc{installDirBase: "usr/share"}
+ InitPrebuiltEtcModule(module)
+ // This module is host-only
+ InitAndroidArchModule(module, HostSupported, MultilibCommon)
+ return module
+}
+
const (
// coreMode is the variant for modules to be installed to system.
coreMode = "core"
diff --git a/android/prebuilt_etc_test.go b/android/prebuilt_etc_test.go
index 206f53b..e0ade7e 100644
--- a/android/prebuilt_etc_test.go
+++ b/android/prebuilt_etc_test.go
@@ -19,17 +19,19 @@
"bytes"
"io/ioutil"
"os"
+ "path/filepath"
"strings"
"testing"
)
-func testPrebuiltEtc(t *testing.T, bp string) *TestContext {
+func testPrebuiltEtc(t *testing.T, bp string) (*TestContext, Config) {
config, buildDir := setUp(t)
defer tearDown(buildDir)
ctx := NewTestArchContext()
ctx.RegisterModuleType("prebuilt_etc", ModuleFactoryAdaptor(PrebuiltEtcFactory))
ctx.RegisterModuleType("prebuilt_etc_host", ModuleFactoryAdaptor(PrebuiltEtcHostFactory))
ctx.RegisterModuleType("prebuilt_usr_share", ModuleFactoryAdaptor(PrebuiltUserShareFactory))
+ ctx.RegisterModuleType("prebuilt_usr_share_host", ModuleFactoryAdaptor(PrebuiltUserShareHostFactory))
ctx.PreDepsMutators(func(ctx RegisterMutatorsContext) {
ctx.BottomUp("prebuilt_etc", prebuiltEtcMutator).Parallel()
})
@@ -46,7 +48,7 @@
_, errs = ctx.PrepareBuildActions(config)
FailIfErrored(t, errs)
- return ctx
+ return ctx, config
}
func setUp(t *testing.T) (config Config, buildDir string) {
@@ -64,7 +66,7 @@
}
func TestPrebuiltEtcVariants(t *testing.T) {
- ctx := testPrebuiltEtc(t, `
+ ctx, _ := testPrebuiltEtc(t, `
prebuilt_etc {
name: "foo.conf",
src: "foo.conf",
@@ -98,7 +100,7 @@
}
func TestPrebuiltEtcOutputPath(t *testing.T) {
- ctx := testPrebuiltEtc(t, `
+ ctx, _ := testPrebuiltEtc(t, `
prebuilt_etc {
name: "foo.conf",
src: "foo.conf",
@@ -113,7 +115,7 @@
}
func TestPrebuiltEtcGlob(t *testing.T) {
- ctx := testPrebuiltEtc(t, `
+ ctx, _ := testPrebuiltEtc(t, `
prebuilt_etc {
name: "my_foo",
src: "foo.*",
@@ -137,7 +139,7 @@
}
func TestPrebuiltEtcAndroidMk(t *testing.T) {
- ctx := testPrebuiltEtc(t, `
+ ctx, _ := testPrebuiltEtc(t, `
prebuilt_etc {
name: "foo",
src: "foo.conf",
@@ -181,7 +183,7 @@
}
func TestPrebuiltEtcHost(t *testing.T) {
- ctx := testPrebuiltEtc(t, `
+ ctx, _ := testPrebuiltEtc(t, `
prebuilt_etc_host {
name: "foo.conf",
src: "foo.conf",
@@ -196,7 +198,7 @@
}
func TestPrebuiltUserShareInstallDirPath(t *testing.T) {
- ctx := testPrebuiltEtc(t, `
+ ctx, _ := testPrebuiltEtc(t, `
prebuilt_usr_share {
name: "foo.conf",
src: "foo.conf",
@@ -210,3 +212,20 @@
t.Errorf("expected %q, got %q", expected, p.installDirPath.RelPathString())
}
}
+
+func TestPrebuiltUserShareHostInstallDirPath(t *testing.T) {
+ ctx, config := testPrebuiltEtc(t, `
+ prebuilt_usr_share_host {
+ name: "foo.conf",
+ src: "foo.conf",
+ sub_dir: "bar",
+ }
+ `)
+
+ buildOS := BuildOs.String()
+ p := ctx.ModuleForTests("foo.conf", buildOS+"_common").Module().(*PrebuiltEtc)
+ expected := filepath.Join("host", config.PrebuiltOS(), "usr", "share", "bar")
+ if p.installDirPath.RelPathString() != expected {
+ t.Errorf("expected %q, got %q", expected, p.installDirPath.RelPathString())
+ }
+}
diff --git a/dexpreopt/dexpreopt_test.go b/dexpreopt/dexpreopt_test.go
index 2a58ab9..6dfa9d2 100644
--- a/dexpreopt/dexpreopt_test.go
+++ b/dexpreopt/dexpreopt_test.go
@@ -64,7 +64,7 @@
{android.PathForOutput(ctx, "test/oat/arm/package.vdex"), "/system/app/test/oat/arm/test.vdex"},
}
- if !reflect.DeepEqual(rule.Installs(), wantInstalls) {
+ if rule.Installs().String() != wantInstalls.String() {
t.Errorf("\nwant installs:\n %v\ngot:\n %v", wantInstalls, rule.Installs())
}
}
@@ -100,7 +100,7 @@
{android.PathForOutput(ctx, "test/oat/arm/package.vdex"), "/system_other/app/test/oat/arm/test.vdex"},
}
- if !reflect.DeepEqual(rule.Installs(), wantInstalls) {
+ if rule.Installs().String() != wantInstalls.String() {
t.Errorf("\nwant installs:\n %v\ngot:\n %v", wantInstalls, rule.Installs())
}
}
@@ -123,7 +123,7 @@
{android.PathForOutput(ctx, "test/oat/arm/package.vdex"), "/system/app/test/oat/arm/test.vdex"},
}
- if !reflect.DeepEqual(rule.Installs(), wantInstalls) {
+ if rule.Installs().String() != wantInstalls.String() {
t.Errorf("\nwant installs:\n %v\ngot:\n %v", wantInstalls, rule.Installs())
}
}
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go
index 280b601..409b4b1 100644
--- a/java/dexpreopt_config.go
+++ b/java/dexpreopt_config.go
@@ -114,7 +114,7 @@
for _, target := range ctx.Config().Targets[android.Android] {
images[target.Arch.ArchType] = dir.Join(ctx,
- "system/framework", target.Arch.ArchType.String(), "boot.art")
+ "system/framework", target.Arch.ArchType.String()).Join(ctx, "boot.art")
}
return bootImageConfig{