Merge "Switch to toybox cp(1)."
diff --git a/Android.bp b/Android.bp
index 37be36c..29ad569 100644
--- a/Android.bp
+++ b/Android.bp
@@ -255,6 +255,7 @@
],
testSrcs: [
"java/app_test.go",
+ "java/dexpreopt_test.go",
"java/java_test.go",
"java/jdeps_test.go",
],
diff --git a/android/testing.go b/android/testing.go
index ca7e7ce..d318839 100644
--- a/android/testing.go
+++ b/android/testing.go
@@ -121,33 +121,59 @@
ctx.Context.MockFileSystem(files)
}
+// TestingModule is wrapper around an android.Module that provides methods to find information about individual
+// ctx.Build parameters for verification in tests.
type TestingModule struct {
module Module
}
+// Module returns the Module wrapped by the TestingModule.
func (m TestingModule) Module() Module {
return m.module
}
-func (m TestingModule) Rule(rule string) BuildParams {
+// MaybeRule finds a call to ctx.Build with BuildParams.Rule set to a rule with the given name. Returns an empty
+// BuildParams if no rule is found.
+func (m TestingModule) MaybeRule(rule string) BuildParams {
for _, p := range m.module.BuildParamsForTests() {
if strings.Contains(p.Rule.String(), rule) {
return p
}
}
- panic(fmt.Errorf("couldn't find rule %q", rule))
+ return BuildParams{}
}
-func (m TestingModule) Description(desc string) BuildParams {
+// Rule finds a call to ctx.Build with BuildParams.Rule set to a rule with the given name. Panics if no rule is found.
+func (m TestingModule) Rule(rule string) BuildParams {
+ p := m.MaybeRule(rule)
+ if p.Rule == nil {
+ panic(fmt.Errorf("couldn't find rule %q", rule))
+ }
+ return p
+}
+
+// MaybeDescription finds a call to ctx.Build with BuildParams.Description set to a the given string. Returns an empty
+// BuildParams if no rule is found.
+func (m TestingModule) MaybeDescription(desc string) BuildParams {
for _, p := range m.module.BuildParamsForTests() {
if p.Description == desc {
return p
}
}
- panic(fmt.Errorf("couldn't find description %q", desc))
+ return BuildParams{}
}
-func (m TestingModule) Output(file string) BuildParams {
+// Description finds a call to ctx.Build with BuildParams.Description set to a the given string. Panics if no rule is
+// found.
+func (m TestingModule) Description(desc string) BuildParams {
+ p := m.MaybeDescription(desc)
+ if p.Rule == nil {
+ panic(fmt.Errorf("couldn't find description %q", desc))
+ }
+ return p
+}
+
+func (m TestingModule) maybeOutput(file string) (BuildParams, []string) {
var searchedOutputs []string
for _, p := range m.module.BuildParamsForTests() {
outputs := append(WritablePaths(nil), p.Outputs...)
@@ -156,13 +182,30 @@
}
for _, f := range outputs {
if f.String() == file || f.Rel() == file {
- return p
+ return p, nil
}
searchedOutputs = append(searchedOutputs, f.Rel())
}
}
- panic(fmt.Errorf("couldn't find output %q.\nall outputs: %v",
- file, searchedOutputs))
+ return BuildParams{}, searchedOutputs
+}
+
+// MaybeOutput finds a call to ctx.Build with a BuildParams.Output or BuildParams.Outputspath whose String() or Rel()
+// value matches the provided string. Returns an empty BuildParams if no rule is found.
+func (m TestingModule) MaybeOutput(file string) BuildParams {
+ p, _ := m.maybeOutput(file)
+ return p
+}
+
+// Output finds a call to ctx.Build with a BuildParams.Output or BuildParams.Outputspath whose String() or Rel()
+// value matches the provided string. Panics if no rule is found.
+func (m TestingModule) Output(file string) BuildParams {
+ p, searchedOutputs := m.maybeOutput(file)
+ if p.Rule == nil {
+ panic(fmt.Errorf("couldn't find output %q.\nall outputs: %v",
+ file, searchedOutputs))
+ }
+ return p
}
func FailIfErrored(t *testing.T, errs []error) {
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index d16ac93..c8228ed 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -42,6 +42,7 @@
var rewriteProperties = map[string](func(variableAssignmentContext) error){
// custom functions
+ "LOCAL_32_BIT_ONLY": local32BitOnly,
"LOCAL_AIDL_INCLUDES": localAidlIncludes,
"LOCAL_C_INCLUDES": localIncludeDirs,
"LOCAL_EXPORT_C_INCLUDE_DIRS": exportIncludeDirs,
@@ -360,6 +361,20 @@
return splitAndAssign(ctx, classifyLocalOrGlobalPath, map[string]string{"global": "export_include_dirs", "local": "export_include_dirs"})
}
+func local32BitOnly(ctx variableAssignmentContext) error {
+ val, err := makeVariableToBlueprint(ctx.file, ctx.mkvalue, bpparser.BoolType)
+ if err != nil {
+ return err
+ }
+ if val.(*bpparser.Bool).Value {
+ thirtyTwo := &bpparser.String{
+ Value: "32",
+ }
+ setVariable(ctx.file, false, ctx.prefix, "compile_multilib", thirtyTwo, true)
+ }
+ return nil
+}
+
func localAidlIncludes(ctx variableAssignmentContext) error {
return splitAndAssign(ctx, classifyLocalOrGlobalPath, map[string]string{"global": "aidl.include_dirs", "local": "aidl.local_include_dirs"})
}
diff --git a/apex/apex.go b/apex/apex.go
index d91bb3c..c6d2e8e 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -40,7 +40,7 @@
Command: `echo '/ 1000 1000 0755' > ${out} && ` +
`echo '/apex_manifest.json 1000 1000 0644' >> ${out} && ` +
`echo ${ro_paths} | tr ' ' '\n' | awk '{print "/"$$1 " 1000 1000 0644"}' >> ${out} && ` +
- `echo ${exec_paths} | tr ' ' '\n' | awk '{print "/"$$1 " 1000 1000 0755"}' >> ${out}`,
+ `echo ${exec_paths} | tr ' ' '\n' | awk '{print "/"$$1 " 0 2000 0755"}' >> ${out}`,
Description: "fs_config ${out}",
}, "ro_paths", "exec_paths")
diff --git a/dexpreopt/config.go b/dexpreopt/config.go
index c24caac..13a14f4 100644
--- a/dexpreopt/config.go
+++ b/dexpreopt/config.go
@@ -32,7 +32,10 @@
DisableGenerateProfile bool // don't generate profiles
- BootJars []string // jars that form the boot image
+ PreoptBootClassPathDexFiles []string // file paths of boot class path files
+ PreoptBootClassPathDexLocations []string // virtual locations of boot class path files
+
+ BootJars []string // modules for jars that form the boot class path
SystemServerJars []string // jars that form the system server
SystemServerApps []string // apps that are loaded into system server
SpeedApps []string // apps that should be speed optimized
diff --git a/dexpreopt/dexpreopt.go b/dexpreopt/dexpreopt.go
index 3b21106..4ad039f 100644
--- a/dexpreopt/dexpreopt.go
+++ b/dexpreopt/dexpreopt.go
@@ -192,6 +192,9 @@
pathtools.ReplaceExtension(filepath.Base(path), "odex"))
}
+ bcp := strings.Join(global.PreoptBootClassPathDexFiles, ":")
+ bcp_locations := strings.Join(global.PreoptBootClassPathDexLocations, ":")
+
odexPath := toOdexPath(filepath.Join(filepath.Dir(module.BuildPath), base))
odexInstallPath := toOdexPath(module.DexLocation)
if odexOnSystemOther(module, global) {
@@ -310,6 +313,9 @@
FlagWithOutput("--write-invocation-to=", invocationPath).ImplicitOutput(invocationPath).
Flag("--runtime-arg").FlagWithArg("-Xms", global.Dex2oatXms).
Flag("--runtime-arg").FlagWithArg("-Xmx", global.Dex2oatXmx).
+ Flag("--runtime-arg").FlagWithArg("-Xbootclasspath:", bcp).
+ Implicits(global.PreoptBootClassPathDexFiles).
+ Flag("--runtime-arg").FlagWithArg("-Xbootclasspath-locations:", bcp_locations).
Flag("${class_loader_context_arg}").
Flag("${stored_class_loader_context_arg}").
FlagWithArg("--boot-image=", bootImageLocation).Implicit(bootImagePath).
diff --git a/dexpreopt/script.go b/dexpreopt/script.go
index fd4cf82..9d4329c 100644
--- a/dexpreopt/script.go
+++ b/dexpreopt/script.go
@@ -147,6 +147,11 @@
return c
}
+func (c *Command) Implicits(paths []string) *Command {
+ c.inputs = append(c.inputs, paths...)
+ return c
+}
+
func (c *Command) Output(path string) *Command {
c.outputs = append(c.outputs, path)
return c.Text(path)
diff --git a/java/app.go b/java/app.go
index a037ef3..f99b299 100644
--- a/java/app.go
+++ b/java/app.go
@@ -213,7 +213,6 @@
installDir = filepath.Join("app", ctx.ModuleName())
}
a.dexpreopter.installPath = android.PathForModuleInstall(ctx, installDir, ctx.ModuleName()+".apk")
- a.dexpreopter.isPrivApp = Bool(a.appProperties.Privileged)
if ctx.ModuleName() != "framework-res" {
a.Module.compile(ctx, a.aaptSrcJar)
diff --git a/java/dexpreopt.go b/java/dexpreopt.go
index de9c5f3..ce51aba 100644
--- a/java/dexpreopt.go
+++ b/java/dexpreopt.go
@@ -28,10 +28,11 @@
type dexpreopter struct {
dexpreoptProperties DexpreoptProperties
- installPath android.OutputPath
- isPrivApp bool
- isSDKLibrary bool
- isTest bool
+ installPath android.OutputPath
+ uncompressedDex bool
+ isSDKLibrary bool
+ isTest bool
+ isInstallable bool
builtInstalled []string
}
@@ -74,6 +75,10 @@
return true
}
+ if !d.isInstallable {
+ return true
+ }
+
// TODO: contains no java code
return false
@@ -140,19 +145,13 @@
deps = append(deps, profileClassListing.Path())
}
- uncompressedDex := false
- if ctx.Config().UncompressPrivAppDex() &&
- (d.isPrivApp || inList(ctx.ModuleName(), ctx.Config().ModulesLoadedByPrivilegedModules())) {
- uncompressedDex = true
- }
-
dexpreoptConfig := dexpreopt.ModuleConfig{
Name: ctx.ModuleName(),
DexLocation: dexLocation,
BuildPath: android.PathForModuleOut(ctx, "dexpreopt", ctx.ModuleName()+".jar").String(),
DexPath: dexJarFile.String(),
PreferCodeIntegrity: false,
- UncompressedDex: uncompressedDex,
+ UncompressedDex: d.uncompressedDex,
HasApkLibraries: false,
PreoptFlags: nil,
diff --git a/java/dexpreopt_test.go b/java/dexpreopt_test.go
new file mode 100644
index 0000000..6838bd2
--- /dev/null
+++ b/java/dexpreopt_test.go
@@ -0,0 +1,145 @@
+// Copyright 2018 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.
+
+package java
+
+import (
+ "testing"
+)
+
+func TestDexpreoptEnabled(t *testing.T) {
+ tests := []struct {
+ name string
+ bp string
+ enabled bool
+ }{
+ {
+ name: "app",
+ bp: `
+ android_app {
+ name: "foo",
+ srcs: ["a.java"],
+ }`,
+ enabled: true,
+ },
+ {
+ name: "installable java library",
+ bp: `
+ java_library {
+ name: "foo",
+ installable: true,
+ srcs: ["a.java"],
+ }`,
+ enabled: true,
+ },
+ {
+ name: "java binary",
+ bp: `
+ java_binary {
+ name: "foo",
+ srcs: ["a.java"],
+ }`,
+ enabled: true,
+ },
+
+ {
+ name: "app without sources",
+ bp: `
+ android_app {
+ name: "foo",
+ }`,
+ // TODO(ccross): this should probably be false
+ enabled: true,
+ },
+ {
+ name: "installable java library without sources",
+ bp: `
+ java_library {
+ name: "foo",
+ installable: true,
+ }`,
+ // TODO(ccross): this should probably be false
+ enabled: true,
+ },
+
+ {
+ name: "static java library",
+ bp: `
+ java_library {
+ name: "foo",
+ srcs: ["a.java"],
+ }`,
+ enabled: false,
+ },
+ {
+ name: "java test",
+ bp: `
+ java_test {
+ name: "foo",
+ srcs: ["a.java"],
+ }`,
+ enabled: false,
+ },
+ {
+ name: "android test",
+ bp: `
+ android_test {
+ name: "foo",
+ srcs: ["a.java"],
+ }`,
+ enabled: false,
+ },
+ {
+ name: "android test helper app",
+ bp: `
+ android_test_helper_app {
+ name: "foo",
+ srcs: ["a.java"],
+ }`,
+ enabled: false,
+ },
+ {
+ name: "compile_dex",
+ bp: `
+ java_library {
+ name: "foo",
+ srcs: ["a.java"],
+ compile_dex: true,
+ }`,
+ enabled: false,
+ },
+ }
+
+ for _, test := range tests {
+ t.Run(test.name, func(t *testing.T) {
+ ctx := testJava(t, test.bp)
+
+ dexpreopt := ctx.ModuleForTests("foo", "android_common").MaybeDescription("dexpreopt")
+ enabled := dexpreopt.Rule != nil
+
+ if enabled != test.enabled {
+ t.Fatalf("want dexpreopt %s, got %s", enabledString(test.enabled), enabledString(enabled))
+ }
+ })
+
+ }
+}
+
+func enabledString(enabled bool) string {
+ if enabled {
+ return "enabled"
+ } else {
+ return "disabled"
+ }
+}
diff --git a/java/java.go b/java/java.go
index c02ccd3..8b8e4ba 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1326,6 +1326,8 @@
j.dexJarFile = dexOutputFile
+ j.dexpreopter.isInstallable = Bool(j.properties.Installable)
+ j.dexpreopter.uncompressedDex = j.deviceProperties.UncompressDex
dexOutputFile = j.dexpreopt(ctx, dexOutputFile)
j.maybeStrippedDexJarFile = dexOutputFile
@@ -1498,9 +1500,14 @@
Module
}
+func (j *Library) shouldUncompressDex(ctx android.ModuleContext) bool {
+ return false
+}
+
func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.dexpreopter.installPath = android.PathForModuleInstall(ctx, "framework", ctx.ModuleName()+".jar")
j.dexpreopter.isSDKLibrary = j.deviceProperties.IsSDKLibrary
+ j.deviceProperties.UncompressDex = j.shouldUncompressDex(ctx)
j.compile(ctx)
if Bool(j.properties.Installable) || ctx.Host() {
@@ -1601,6 +1608,7 @@
&module.testProperties)
module.Module.properties.Installable = proptools.BoolPtr(true)
+ module.Module.dexpreopter.isTest = true
InitJavaModule(module, android.HostAndDeviceSupported)
return module
diff --git a/java/java_test.go b/java/java_test.go
index 2a54f69..c4cf905 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -76,9 +76,12 @@
ctx.RegisterModuleType("android_app", android.ModuleFactoryAdaptor(AndroidAppFactory))
ctx.RegisterModuleType("android_library", android.ModuleFactoryAdaptor(AndroidLibraryFactory))
ctx.RegisterModuleType("android_test", android.ModuleFactoryAdaptor(AndroidTestFactory))
+ ctx.RegisterModuleType("android_test_helper_app", android.ModuleFactoryAdaptor(AndroidTestHelperAppFactory))
+ ctx.RegisterModuleType("java_binary", android.ModuleFactoryAdaptor(BinaryFactory))
ctx.RegisterModuleType("java_binary_host", android.ModuleFactoryAdaptor(BinaryHostFactory))
ctx.RegisterModuleType("java_library", android.ModuleFactoryAdaptor(LibraryFactory))
ctx.RegisterModuleType("java_library_host", android.ModuleFactoryAdaptor(LibraryHostFactory))
+ ctx.RegisterModuleType("java_test", android.ModuleFactoryAdaptor(TestFactory))
ctx.RegisterModuleType("java_import", android.ModuleFactoryAdaptor(ImportFactory))
ctx.RegisterModuleType("java_defaults", android.ModuleFactoryAdaptor(defaultsFactory))
ctx.RegisterModuleType("java_system_modules", android.ModuleFactoryAdaptor(SystemModulesFactory))