Merge "Add Srcs_lib and Srcs_lib_whitelist_dirs properties"
diff --git a/Android.bp b/Android.bp
index 37be36c..d5f052e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -249,14 +249,17 @@
"java/java_resources.go",
"java/prebuilt_apis.go",
"java/proto.go",
+ "java/sdk.go",
"java/sdk_library.go",
"java/support_libraries.go",
"java/system_modules.go",
],
testSrcs: [
"java/app_test.go",
+ "java/dexpreopt_test.go",
"java/java_test.go",
"java/jdeps_test.go",
+ "java/sdk_test.go",
],
pluginFor: ["soong_build"],
}
diff --git a/android/config.go b/android/config.go
index f046318..65c58ac 100644
--- a/android/config.go
+++ b/android/config.go
@@ -862,6 +862,24 @@
return c.config.productVariables.BoardPlatPrivateSepolicyDirs
}
+func (c *deviceConfig) OverrideManifestPackageNameFor(name string) (manifestName string, overridden bool) {
+ overrides := c.config.productVariables.ManifestPackageNameOverrides
+ if overrides == nil || len(overrides) == 0 {
+ return "", false
+ }
+ for _, o := range overrides {
+ split := strings.Split(o, ":")
+ if len(split) != 2 {
+ // This shouldn't happen as this is first checked in make, but just in case.
+ panic(fmt.Errorf("invalid override rule %q in PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES should be <module_name>:<manifest_name>", o))
+ }
+ if matchPattern(split[0], name) {
+ return substPattern(split[0], split[1], name), true
+ }
+ }
+ return "", false
+}
+
func (c *config) SecondArchIsTranslated() bool {
deviceTargets := c.Targets[Android]
if len(deviceTargets) < 2 {
@@ -932,6 +950,14 @@
return Bool(c.productVariables.FlattenApex)
}
+func (c *config) EnforceSystemCertificate() bool {
+ return Bool(c.productVariables.EnforceSystemCertificate)
+}
+
+func (c *config) EnforceSystemCertificateWhitelist() []string {
+ return c.productVariables.EnforceSystemCertificateWhitelist
+}
+
func stringSlice(s *[]string) []string {
if s != nil {
return *s
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/android/util.go b/android/util.go
index e9b9764..92ab845 100644
--- a/android/util.go
+++ b/android/util.go
@@ -202,3 +202,44 @@
}
return v
}
+
+// copied from build/kati/strutil.go
+func substPattern(pat, repl, str string) string {
+ ps := strings.SplitN(pat, "%", 2)
+ if len(ps) != 2 {
+ if str == pat {
+ return repl
+ }
+ return str
+ }
+ in := str
+ trimed := str
+ if ps[0] != "" {
+ trimed = strings.TrimPrefix(in, ps[0])
+ if trimed == in {
+ return str
+ }
+ }
+ in = trimed
+ if ps[1] != "" {
+ trimed = strings.TrimSuffix(in, ps[1])
+ if trimed == in {
+ return str
+ }
+ }
+
+ rs := strings.SplitN(repl, "%", 2)
+ if len(rs) != 2 {
+ return repl
+ }
+ return rs[0] + trimed + rs[1]
+}
+
+// copied from build/kati/strutil.go
+func matchPattern(pat, str string) bool {
+ i := strings.IndexByte(pat, '%')
+ if i < 0 {
+ return pat == str
+ }
+ return strings.HasPrefix(str, pat[:i]) && strings.HasSuffix(str, pat[i+1:])
+}
diff --git a/android/variable.go b/android/variable.go
index a1cdea1..7e976cd 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -261,6 +261,11 @@
FlattenApex *bool `json:",omitempty"`
DexpreoptGlobalConfig *string `json:",omitempty"`
+
+ ManifestPackageNameOverrides []string `json:",omitempty"`
+
+ EnforceSystemCertificate *bool `json:",omitempty"`
+ EnforceSystemCertificateWhitelist []string `json:",omitempty"`
}
func boolPtr(v bool) *bool {
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index 99b3523..a28cf49 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,
@@ -144,6 +145,7 @@
"LOCAL_AAPT_FLAGS": "aaptflags",
"LOCAL_PACKAGE_SPLITS": "package_splits",
"LOCAL_COMPATIBILITY_SUITE": "test_suites",
+ "LOCAL_OVERRIDES_PACKAGES": "overrides",
"LOCAL_ANNOTATION_PROCESSORS": "annotation_processors",
"LOCAL_ANNOTATION_PROCESSOR_CLASSES": "annotation_processor_classes",
@@ -156,6 +158,10 @@
"LOCAL_SHARED_ANDROID_LIBRARIES": "android_libs",
"LOCAL_STATIC_ANDROID_LIBRARIES": "android_static_libs",
"LOCAL_ADDITIONAL_CERTIFICATES": "additional_certificates",
+
+ // Jacoco filters:
+ "LOCAL_JACK_COVERAGE_INCLUDE_FILTER": "jacoco.include_filter",
+ "LOCAL_JACK_COVERAGE_EXCLUDE_FILTER": "jacoco.exclude_filter",
})
addStandardProperties(bpparser.BoolType,
@@ -359,6 +365,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"})
}
@@ -738,27 +758,31 @@
true: "product_variables.pdk"},
}
-func mydir(args []string) string {
- return "."
+func mydir(args []string) []string {
+ return []string{"."}
}
-func allFilesUnder(wildcard string) func(args []string) string {
- return func(args []string) string {
- dir := ""
+func allFilesUnder(wildcard string) func(args []string) []string {
+ return func(args []string) []string {
+ dirs := []string{""}
if len(args) > 0 {
- dir = strings.TrimSpace(args[0])
+ dirs = strings.Fields(args[0])
}
- return fmt.Sprintf("%s/**/"+wildcard, dir)
+ paths := make([]string, len(dirs))
+ for i := range paths {
+ paths[i] = fmt.Sprintf("%s/**/"+wildcard, dirs[i])
+ }
+ return paths
}
}
-func allSubdirJavaFiles(args []string) string {
- return "**/*.java"
+func allSubdirJavaFiles(args []string) []string {
+ return []string{"**/*.java"}
}
-func includeIgnored(args []string) string {
- return include_ignored
+func includeIgnored(args []string) []string {
+ return []string{include_ignored}
}
var moduleTypes = map[string]string{
diff --git a/androidmk/cmd/androidmk/androidmk_test.go b/androidmk/cmd/androidmk/androidmk_test.go
index 0f6c5ac..c750f22 100644
--- a/androidmk/cmd/androidmk/androidmk_test.go
+++ b/androidmk/cmd/androidmk/androidmk_test.go
@@ -554,6 +554,10 @@
LOCAL_SRC_FILES := d.java
LOCAL_UNINSTALLABLE_MODULE := false
include $(BUILD_JAVA_LIBRARY)
+
+ include $(CLEAR_VARS)
+ LOCAL_SRC_FILES := $(call all-java-files-under, src gen)
+ include $(BUILD_STATIC_JAVA_LIBRARY)
`,
expected: `
java_library {
@@ -574,6 +578,13 @@
installable: true,
srcs: ["d.java"],
}
+
+ java_library {
+ srcs: [
+ "src/**/*.java",
+ "gen/**/*.java",
+ ],
+ }
`,
},
{
@@ -632,12 +643,14 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := test.java
LOCAL_RESOURCE_DIR := res
+ LOCAL_JACK_COVERAGE_INCLUDE_FILTER := foo.*
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := test.java
LOCAL_STATIC_LIBRARIES := foo
LOCAL_STATIC_ANDROID_LIBRARIES := bar
+ LOCAL_JACK_COVERAGE_EXCLUDE_FILTER := bar.*
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(CLEAR_VARS)
@@ -655,6 +668,9 @@
android_library {
srcs: ["test.java"],
resource_dirs: ["res"],
+ jacoco: {
+ include_filter: ["foo.*"],
+ },
}
android_library {
@@ -663,6 +679,9 @@
"foo",
"bar",
],
+ jacoco: {
+ exclude_filter: ["bar.*"],
+ },
}
android_library {
diff --git a/androidmk/cmd/androidmk/values.go b/androidmk/cmd/androidmk/values.go
index d240a01..90f2e74 100644
--- a/androidmk/cmd/androidmk/values.go
+++ b/androidmk/cmd/androidmk/values.go
@@ -29,6 +29,14 @@
}
}
+func stringListToStringValueList(list []string) []bpparser.Expression {
+ valList := make([]bpparser.Expression, len(list))
+ for i, l := range list {
+ valList[i] = stringToStringValue(l)
+ }
+ return valList
+}
+
func addValues(val1, val2 bpparser.Expression) (bpparser.Expression, error) {
if val1 == nil {
return val2, nil
@@ -63,7 +71,10 @@
for i, s := range ms.Strings[1:] {
if ret, ok := ms.Variables[i].EvalFunction(scope); ok {
- val, err = addValues(val, stringToStringValue(ret))
+ if len(ret) > 1 {
+ return nil, fmt.Errorf("Unexpected list value %s", ms.Dump())
+ }
+ val, err = addValues(val, stringToStringValue(ret[0]))
} else {
name := ms.Variables[i].Name
if !name.Const() {
@@ -125,9 +136,7 @@
for _, f := range fields {
if len(f.Variables) == 1 && f.Strings[0] == "" && f.Strings[1] == "" {
if ret, ok := f.Variables[0].EvalFunction(scope); ok {
- listValue.Values = append(listValue.Values, &bpparser.String{
- Value: ret,
- })
+ listValue.Values = append(listValue.Values, stringListToStringValueList(ret)...)
} else {
// Variable by itself, variable is probably a list
if !f.Variables[0].Name.Const() {
diff --git a/androidmk/parser/scope.go b/androidmk/parser/scope.go
index 167e470..8111c89 100644
--- a/androidmk/parser/scope.go
+++ b/androidmk/parser/scope.go
@@ -21,13 +21,13 @@
type Scope interface {
Get(name string) string
Set(name, value string)
- Call(name string, args []string) string
- SetFunc(name string, f func([]string) string)
+ Call(name string, args []string) []string
+ SetFunc(name string, f func([]string) []string)
}
type scope struct {
variables map[string]string
- functions map[string]func([]string) string
+ functions map[string]func([]string) []string
parent Scope
}
@@ -47,22 +47,22 @@
s.variables[name] = value
}
-func (s *scope) Call(name string, args []string) string {
+func (s *scope) Call(name string, args []string) []string {
if f, ok := s.functions[name]; ok {
return f(args)
}
- return "<func:'" + name + "' unset>"
+ return []string{"<func:'" + name + "' unset>"}
}
-func (s *scope) SetFunc(name string, f func([]string) string) {
+func (s *scope) SetFunc(name string, f func([]string) []string) {
s.functions[name] = f
}
func NewScope(parent Scope) Scope {
return &scope{
variables: make(map[string]string),
- functions: make(map[string]func([]string) string),
+ functions: make(map[string]func([]string) []string),
parent: parent,
}
}
@@ -74,7 +74,7 @@
builtinScope[builtinDollar] = "$"
}
-func (v Variable) EvalFunction(scope Scope) (string, bool) {
+func (v Variable) EvalFunction(scope Scope) ([]string, bool) {
f := v.Name.SplitN(" \t", 2)
if len(f) > 1 && f[0].Const() {
fname := f[0].Value(nil)
@@ -88,17 +88,20 @@
if fname == "call" {
return scope.Call(argVals[0], argVals[1:]), true
} else {
- return "__builtin_func:" + fname + " " + strings.Join(argVals, " "), true
+ return []string{"__builtin_func:" + fname + " " + strings.Join(argVals, " ")}, true
}
}
}
- return "", false
+ return []string{""}, false
}
func (v Variable) Value(scope Scope) string {
if ret, ok := v.EvalFunction(scope); ok {
- return ret
+ if len(ret) > 1 {
+ panic("Expected a single value, but instead got a list")
+ }
+ return ret[0]
}
if scope == nil {
panic("Cannot take the value of a variable in a nil scope")
diff --git a/apex/apex.go b/apex/apex.go
index 79b79e8..9f5a46c 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")
@@ -374,6 +374,7 @@
func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
targets := ctx.MultiTargets()
+ config := ctx.DeviceConfig()
has32BitTarget := false
for _, target := range targets {
if target.Arch.ArchType.Multilib == "lib32" {
@@ -385,7 +386,7 @@
// multilib.both.
ctx.AddFarVariationDependencies([]blueprint.Variation{
{Mutator: "arch", Variation: target.String()},
- {Mutator: "image", Variation: a.getImageVariation()},
+ {Mutator: "image", Variation: a.getImageVariation(config)},
{Mutator: "link", Variation: "shared"},
}, sharedLibTag, a.properties.Native_shared_libs...)
@@ -393,21 +394,21 @@
addDependenciesForNativeModules(ctx,
a.properties.Multilib.Both.Native_shared_libs,
a.properties.Multilib.Both.Binaries, target.String(),
- a.getImageVariation())
+ a.getImageVariation(config))
if i == 0 {
// When multilib.* is omitted for binaries, it implies
// multilib.first.
ctx.AddFarVariationDependencies([]blueprint.Variation{
{Mutator: "arch", Variation: target.String()},
- {Mutator: "image", Variation: a.getImageVariation()},
+ {Mutator: "image", Variation: a.getImageVariation(config)},
}, executableTag, a.properties.Binaries...)
// Add native modules targetting the first ABI
addDependenciesForNativeModules(ctx,
a.properties.Multilib.First.Native_shared_libs,
a.properties.Multilib.First.Binaries, target.String(),
- a.getImageVariation())
+ a.getImageVariation(config))
}
switch target.Arch.ArchType.Multilib {
@@ -416,24 +417,24 @@
addDependenciesForNativeModules(ctx,
a.properties.Multilib.Lib32.Native_shared_libs,
a.properties.Multilib.Lib32.Binaries, target.String(),
- a.getImageVariation())
+ a.getImageVariation(config))
addDependenciesForNativeModules(ctx,
a.properties.Multilib.Prefer32.Native_shared_libs,
a.properties.Multilib.Prefer32.Binaries, target.String(),
- a.getImageVariation())
+ a.getImageVariation(config))
case "lib64":
// Add native modules targetting 64-bit ABI
addDependenciesForNativeModules(ctx,
a.properties.Multilib.Lib64.Native_shared_libs,
a.properties.Multilib.Lib64.Binaries, target.String(),
- a.getImageVariation())
+ a.getImageVariation(config))
if !has32BitTarget {
addDependenciesForNativeModules(ctx,
a.properties.Multilib.Prefer32.Native_shared_libs,
a.properties.Multilib.Prefer32.Binaries, target.String(),
- a.getImageVariation())
+ a.getImageVariation(config))
}
}
@@ -471,8 +472,8 @@
return a.properties.Installable == nil || proptools.Bool(a.properties.Installable)
}
-func (a *apexBundle) getImageVariation() string {
- if proptools.Bool(a.properties.Use_vendor) {
+func (a *apexBundle) getImageVariation(config android.DeviceConfig) string {
+ if config.VndkVersion() != "" && proptools.Bool(a.properties.Use_vendor) {
return "vendor"
} else {
return "core"
@@ -491,6 +492,19 @@
if !cc.Arch().Native {
dirInApex = filepath.Join(dirInApex, cc.Arch().ArchType.String())
}
+ switch cc.Name() {
+ case "libc", "libm", "libdl":
+ // Special case for bionic libs. This is to prevent the bionic libs
+ // from being included in the search path /apex/com.android.apex/lib.
+ // This exclusion is required because bionic libs in the runtime APEX
+ // are available via the legacy paths /system/lib/libc.so, etc. By the
+ // init process, the bionic libs in the APEX are bind-mounted to the
+ // legacy paths and thus will be loaded into the default linker namespace.
+ // If the bionic libs are directly in /apex/com.android.apex/lib then
+ // the same libs will be again loaded to the runtime linker namespace,
+ // which will result double loading of bionic libs that isn't supported.
+ dirInApex = filepath.Join(dirInApex, "bionic")
+ }
fileToCopy = cc.OutputFile().Path()
return
@@ -756,6 +770,11 @@
optFlags = append(optFlags, "--pubkey "+pubKeyFile.String())
}
+ manifestPackageName, overridden := ctx.DeviceConfig().OverrideManifestPackageNameFor(ctx.ModuleName())
+ if overridden {
+ optFlags = append(optFlags, "--override_apk_package_name "+manifestPackageName)
+ }
+
ctx.Build(pctx, android.BuildParams{
Rule: apexRule,
Implicits: implicitInputs,
@@ -831,7 +850,15 @@
// For flattened APEX, do nothing but make sure that apex_manifest.json file is also copied along
// with other ordinary files.
manifest := android.PathForModuleSrc(ctx, proptools.StringDefault(a.properties.Manifest, "apex_manifest.json"))
- a.filesInfo = append(a.filesInfo, apexFile{manifest, ctx.ModuleName() + ".apex_manifest.json", android.Common, ".", etc, nil})
+
+ // rename to apex_manifest.json
+ copiedManifest := android.PathForModuleOut(ctx, "apex_manifest.json")
+ ctx.Build(pctx, android.BuildParams{
+ Rule: android.Cp,
+ Input: manifest,
+ Output: copiedManifest,
+ })
+ a.filesInfo = append(a.filesInfo, apexFile{copiedManifest, ctx.ModuleName() + ".apex_manifest.json", android.Common, ".", etc, nil})
for _, fi := range a.filesInfo {
dir := filepath.Join("apex", ctx.ModuleName(), fi.installDir)
diff --git a/apex/apex_test.go b/apex/apex_test.go
index f8f9b33..d4f0f7e 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -492,6 +492,13 @@
versions: ["27", "28", "29"],
},
}
+
+ cc_library {
+ name: "libBootstrap",
+ srcs: ["mylib.cpp"],
+ stl: "none",
+ bootstrap: true,
+ }
`)
apexRule := ctx.ModuleForTests("myapex", "android_common_myapex").Rule("apexRule")
@@ -499,11 +506,11 @@
// Ensure that mylib, libm, libdl are included.
ensureContains(t, copyCmds, "image.apex/lib64/mylib.so")
- ensureContains(t, copyCmds, "image.apex/lib64/libm.so")
- ensureContains(t, copyCmds, "image.apex/lib64/libdl.so")
+ ensureContains(t, copyCmds, "image.apex/lib64/bionic/libm.so")
+ ensureContains(t, copyCmds, "image.apex/lib64/bionic/libdl.so")
// Ensure that libc is not included (since it has stubs and not listed in native_shared_libs)
- ensureNotContains(t, copyCmds, "image.apex/lib64/libc.so")
+ ensureNotContains(t, copyCmds, "image.apex/lib64/bionic/libc.so")
mylibLdFlags := ctx.ModuleForTests("mylib", "android_arm64_armv8-a_core_shared_myapex").Rule("ld").Args["libFlags"]
mylibCFlags := ctx.ModuleForTests("mylib", "android_arm64_armv8-a_core_static_myapex").Rule("cc").Args["cFlags"]
@@ -538,6 +545,12 @@
// ... Cflags from stub is correctly exported to mylib
ensureContains(t, mylibCFlags, "__LIBDL_API__=27")
ensureContains(t, mylibSharedCFlags, "__LIBDL_API__=27")
+
+ // Ensure that libBootstrap is depending on the platform variant of bionic libs
+ libFlags := ctx.ModuleForTests("libBootstrap", "android_arm64_armv8-a_core_shared").Rule("ld").Args["libFlags"]
+ ensureContains(t, libFlags, "libc/android_arm64_armv8-a_core_shared/libc.so")
+ ensureContains(t, libFlags, "libm/android_arm64_armv8-a_core_shared/libm.so")
+ ensureContains(t, libFlags, "libdl/android_arm64_armv8-a_core_shared/libdl.so")
}
func TestFilesInSubDir(t *testing.T) {
diff --git a/bpfix/bpfix/bpfix.go b/bpfix/bpfix/bpfix.go
index 24a38c9..a4723fb 100644
--- a/bpfix/bpfix/bpfix.go
+++ b/bpfix/bpfix/bpfix.go
@@ -205,6 +205,11 @@
if mod.Type != "java_import" {
continue
}
+ host, _ := getLiteralBoolPropertyValue(mod, "host")
+ if host {
+ mod.Type = "java_import_host"
+ removeProperty(mod, "host")
+ }
srcs, ok := getLiteralListProperty(mod, "srcs")
if !ok {
continue
@@ -705,6 +710,24 @@
return stringValue.Value, true
}
+func getLiteralBoolProperty(mod *parser.Module, name string) (b *parser.Bool, found bool) {
+ prop, ok := mod.GetProperty(name)
+ if !ok {
+ return nil, false
+ }
+ b, ok = prop.Value.(*parser.Bool)
+ return b, ok
+}
+
+func getLiteralBoolPropertyValue(mod *parser.Module, name string) (s bool, found bool) {
+ boolValue, ok := getLiteralBoolProperty(mod, name)
+ if !ok {
+ return false, false
+ }
+
+ return boolValue.Value, true
+}
+
func propertyIndex(props []*parser.Property, propertyName string) int {
for i, prop := range props {
if prop.Name == propertyName {
diff --git a/bpfix/bpfix/bpfix_test.go b/bpfix/bpfix/bpfix_test.go
index 16dfce0..0469faf 100644
--- a/bpfix/bpfix/bpfix_test.go
+++ b/bpfix/bpfix/bpfix_test.go
@@ -555,3 +555,69 @@
})
}
}
+
+func TestRewritePrebuilts(t *testing.T) {
+ tests := []struct {
+ name string
+ in string
+ out string
+ }{
+ {
+ name: "jar srcs",
+ in: `
+ java_import {
+ name: "foo",
+ srcs: ["foo.jar"],
+ }
+ `,
+ out: `
+ java_import {
+ name: "foo",
+ jars: ["foo.jar"],
+ }
+ `,
+ },
+ {
+ name: "aar srcs",
+ in: `
+ java_import {
+ name: "foo",
+ srcs: ["foo.aar"],
+ installable: true,
+ }
+ `,
+ out: `
+ android_library_import {
+ name: "foo",
+ aars: ["foo.aar"],
+
+ }
+ `,
+ },
+ {
+ name: "host prebuilt",
+ in: `
+ java_import {
+ name: "foo",
+ srcs: ["foo.jar"],
+ host: true,
+ }
+ `,
+ out: `
+ java_import_host {
+ name: "foo",
+ jars: ["foo.jar"],
+
+ }
+ `,
+ },
+ }
+
+ for _, test := range tests {
+ t.Run(test.name, func(t *testing.T) {
+ runPass(t, test.in, test.out, func(fixer *Fixer) error {
+ return rewriteIncorrectAndroidmkPrebuilts(fixer)
+ })
+ })
+ }
+}
diff --git a/cc/androidmk.go b/cc/androidmk.go
index 82feec8..7844756 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -29,9 +29,12 @@
)
type AndroidMkContext interface {
+ Name() string
Target() android.Target
subAndroidMk(*android.AndroidMkData, interface{})
useVndk() bool
+ static() bool
+ inRecovery() bool
}
type subAndroidMkProvider interface {
@@ -59,8 +62,12 @@
ret := android.AndroidMkData{
OutputFile: c.outputFile,
- Required: append(c.Properties.AndroidMkRuntimeLibs, c.Properties.ApexesProvidingSharedLibs...),
- Include: "$(BUILD_SYSTEM)/soong_cc_prebuilt.mk",
+ // TODO(jiyong): add the APEXes providing shared libs to the required modules
+ // Currently, adding c.Properties.ApexesProvidingSharedLibs is causing multiple
+ // runtime APEXes (com.android.runtime.debug|release) to be installed. And this
+ // is breaking some older devices (like marlin) where system.img is small.
+ Required: c.Properties.AndroidMkRuntimeLibs,
+ Include: "$(BUILD_SYSTEM)/soong_cc_prebuilt.mk",
Extra: []android.AndroidMkExtraFunc{
func(w io.Writer, outputFile android.Path) {
@@ -172,13 +179,23 @@
}
})
- if library.shared() {
+ if library.shared() && !library.buildStubs() {
ctx.subAndroidMk(ret, library.baseInstaller)
} else {
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true")
+ if library.buildStubs() {
+ fmt.Fprintln(w, "LOCAL_NO_NOTICE_FILE := true")
+ }
})
}
+
+ if len(library.Properties.Stubs.Versions) > 0 && android.DirectlyInAnyApex(ctx.Name()) &&
+ !ctx.inRecovery() && !ctx.useVndk() && !ctx.static() {
+ if !library.buildStubs() {
+ ret.SubName = ".bootstrap"
+ }
+ }
}
func (object *objectLinker) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
diff --git a/cc/cc.go b/cc/cc.go
index ce28a3b..85e3a67 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -201,6 +201,10 @@
Recovery_available *bool
InRecovery bool `blueprint:"mutated"`
+
+ // Allows this module to use non-APEX version of libraries. Useful
+ // for building binaries that are started before APEXes are activated.
+ Bootstrap *bool
}
type VendorProperties struct {
@@ -250,6 +254,8 @@
isPgoCompile() bool
useClangLld(actx ModuleContext) bool
isApex() bool
+ hasStubsVariants() bool
+ isStubs() bool
}
type ModuleContext interface {
@@ -676,6 +682,14 @@
return ctx.mod.ApexName() != ""
}
+func (ctx *moduleContextImpl) hasStubsVariants() bool {
+ return ctx.mod.HasStubsVariants()
+}
+
+func (ctx *moduleContextImpl) isStubs() bool {
+ return ctx.mod.IsStubs()
+}
+
func newBaseModule(hod android.HostOrDeviceSupported, multilib android.Multilib) *Module {
return &Module{
hod: hod,
@@ -855,6 +869,18 @@
return
}
c.outputFile = android.OptionalPathForPath(outputFile)
+
+ // If a lib is directly included in any of the APEXes, unhide the stubs
+ // variant having the latest version gets visible to make. In addition,
+ // the non-stubs variant is renamed to <libname>.bootstrap. This is to
+ // force anything in the make world to link against the stubs library.
+ // (unless it is explicitly referenced via .bootstrap suffix or the
+ // module is marked with 'bootstrap: true').
+ if c.HasStubsVariants() && android.DirectlyInAnyApex(ctx.baseModuleName()) &&
+ !c.inRecovery() && !c.useVndk() && !c.static() && c.IsStubs() {
+ c.Properties.HideFromMake = false // unhide
+ // Note: this is still non-installable
+ }
}
if c.installer != nil && !c.Properties.PreventInstall && c.IsForPlatform() && c.outputFile.Valid() {
@@ -1446,8 +1472,8 @@
// If not building for APEX, use stubs only when it is from
// an APEX (and not from platform)
useThisDep = (depInPlatform != depIsStubs)
- if c.inRecovery() {
- // However, for recovery modules, since there is no APEX there,
+ if c.inRecovery() || Bool(c.Properties.Bootstrap) {
+ // However, for recovery or bootstrap modules,
// always link to non-stub variant
useThisDep = !depIsStubs
}
diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go
index 2bd0cf4..0380368 100644
--- a/cmd/soong_ui/main.go
+++ b/cmd/soong_ui/main.go
@@ -104,9 +104,6 @@
build.SetupOutDir(buildCtx, config)
- metricsPath := filepath.Join(config.OutDir(), "build_metrics")
- defer met.Dump(metricsPath)
-
logsDir := config.OutDir()
if config.Dist() {
logsDir = filepath.Join(config.DistDir(), "logs")
@@ -118,6 +115,8 @@
stat.AddOutput(status.NewVerboseLog(log, filepath.Join(logsDir, "verbose.log")))
stat.AddOutput(status.NewErrorLog(log, filepath.Join(logsDir, "error.log")))
+ defer met.Dump(filepath.Join(logsDir, "build_metrics"))
+
if start, ok := os.LookupEnv("TRACE_BEGIN_SOONG"); ok {
if !strings.HasSuffix(start, "N") {
if start_time, err := strconv.ParseUint(start, 10, 64); err == nil {
diff --git a/dexpreopt/config.go b/dexpreopt/config.go
index c24caac..6b5c40d 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
@@ -110,6 +113,7 @@
PresignedPrebuilt bool
+ NoStripping bool
StripInputPath string
StripOutputPath string
}
diff --git a/dexpreopt/dexpreopt.go b/dexpreopt/dexpreopt.go
index 3b21106..f316be4 100644
--- a/dexpreopt/dexpreopt.go
+++ b/dexpreopt/dexpreopt.go
@@ -95,11 +95,38 @@
rule = &Rule{}
- dexpreoptDisabled := contains(global.DisablePreoptModules, module.Name)
+ generateProfile := module.ProfileClassListing != "" && !global.DisableGenerateProfile
- if contains(global.BootJars, module.Name) {
- // Don't preopt individual boot jars, they will be preopted together
- dexpreoptDisabled = true
+ var profile string
+ if generateProfile {
+ profile = profileCommand(global, module, rule)
+ }
+
+ if !dexpreoptDisabled(global, module) {
+ // Don't preopt individual boot jars, they will be preopted together.
+ // This check is outside dexpreoptDisabled because they still need to be stripped.
+ if !contains(global.BootJars, module.Name) {
+ appImage := (generateProfile || module.ForceCreateAppImage || global.DefaultAppImages) &&
+ !module.NoCreateAppImage
+
+ generateDM := shouldGenerateDM(module, global)
+
+ for _, arch := range module.Archs {
+ imageLocation := module.DexPreoptImageLocation
+ if imageLocation == "" {
+ imageLocation = global.DefaultDexPreoptImageLocation[arch]
+ }
+ dexpreoptCommand(global, module, rule, profile, arch, imageLocation, appImage, generateDM)
+ }
+ }
+ }
+
+ return rule, nil
+}
+
+func dexpreoptDisabled(global GlobalConfig, module ModuleConfig) bool {
+ if contains(global.DisablePreoptModules, module.Name) {
+ return true
}
// If OnlyPreoptBootImageAndSystemServer=true and module is not in boot class path skip
@@ -108,32 +135,10 @@
// or performance. If PreoptExtractedApk is true, we ignore the only preopt boot image options.
if global.OnlyPreoptBootImageAndSystemServer && !contains(global.BootJars, module.Name) &&
!contains(global.SystemServerJars, module.Name) && !module.PreoptExtractedApk {
- dexpreoptDisabled = true
+ return true
}
- generateProfile := module.ProfileClassListing != "" && !global.DisableGenerateProfile
-
- var profile string
- if generateProfile {
- profile = profileCommand(global, module, rule)
- }
-
- if !dexpreoptDisabled {
- appImage := (generateProfile || module.ForceCreateAppImage || global.DefaultAppImages) &&
- !module.NoCreateAppImage
-
- generateDM := shouldGenerateDM(module, global)
-
- for _, arch := range module.Archs {
- imageLocation := module.DexPreoptImageLocation
- if imageLocation == "" {
- imageLocation = global.DefaultDexPreoptImageLocation[arch]
- }
- dexpreoptCommand(global, module, rule, profile, arch, imageLocation, appImage, generateDM)
- }
- }
-
- return rule, nil
+ return false
}
func profileCommand(global GlobalConfig, module ModuleConfig, rule *Rule) string {
@@ -192,6 +197,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 +318,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).
@@ -439,6 +450,14 @@
func shouldStripDex(module ModuleConfig, global GlobalConfig) bool {
strip := !global.DefaultNoStripping
+ if dexpreoptDisabled(global, module) {
+ strip = false
+ }
+
+ if module.NoStripping {
+ strip = false
+ }
+
// Don't strip modules that are not on the system partition in case the oat/vdex version in system ROM
// doesn't match the one in other partitions. It needs to be able to fall back to the APK for that case.
if !strings.HasPrefix(module.DexLocation, SystemPartition) {
diff --git a/dexpreopt/dexpreopt_test.go b/dexpreopt/dexpreopt_test.go
index fef85a7..f218d01 100644
--- a/dexpreopt/dexpreopt_test.go
+++ b/dexpreopt/dexpreopt_test.go
@@ -82,6 +82,7 @@
NoCreateAppImage: false,
ForceCreateAppImage: false,
PresignedPrebuilt: false,
+ NoStripping: false,
StripInputPath: "",
StripOutputPath: "",
}
@@ -162,47 +163,60 @@
}
func TestStripDex(t *testing.T) {
- global, module := testGlobalConfig, testModuleConfig
-
- module.Name = "test"
- module.DexLocation = "/system/app/test/test.apk"
- module.BuildPath = "out/test/test.apk"
- module.Archs = []string{"arm"}
- module.StripInputPath = "$1"
- module.StripOutputPath = "$2"
-
- rule, err := GenerateStripRule(global, module)
- if err != nil {
- t.Error(err)
+ tests := []struct {
+ name string
+ setup func(global *GlobalConfig, module *ModuleConfig)
+ strip bool
+ }{
+ {
+ name: "default strip",
+ setup: func(global *GlobalConfig, module *ModuleConfig) {},
+ strip: true,
+ },
+ {
+ name: "global no stripping",
+ setup: func(global *GlobalConfig, module *ModuleConfig) { global.DefaultNoStripping = true },
+ strip: false,
+ },
+ {
+ name: "module no stripping",
+ setup: func(global *GlobalConfig, module *ModuleConfig) { module.NoStripping = true },
+ strip: false,
+ },
}
- want := `zip2zip -i $1 -o $2 -x "classes*.dex"`
- if len(rule.Commands()) < 1 || !strings.Contains(rule.Commands()[0], want) {
- t.Errorf("\nwant commands[0] to have:\n %v\ngot:\n %v", want, rule.Commands()[0])
- }
-}
+ for _, test := range tests {
+ t.Run(test.name, func(t *testing.T) {
-func TestNoStripDex(t *testing.T) {
- global, module := testGlobalConfig, testModuleConfig
+ global, module := testGlobalConfig, testModuleConfig
- global.DefaultNoStripping = true
+ module.Name = "test"
+ module.DexLocation = "/system/app/test/test.apk"
+ module.BuildPath = "out/test/test.apk"
+ module.Archs = []string{"arm"}
+ module.StripInputPath = "$1"
+ module.StripOutputPath = "$2"
- module.Name = "test"
- module.DexLocation = "/system/app/test/test.apk"
- module.BuildPath = "out/test/test.apk"
- module.Archs = []string{"arm"}
- module.StripInputPath = "$1"
- module.StripOutputPath = "$2"
+ test.setup(&global, &module)
- rule, err := GenerateStripRule(global, module)
- if err != nil {
- t.Error(err)
- }
+ rule, err := GenerateStripRule(global, module)
+ if err != nil {
+ t.Error(err)
+ }
- wantCommands := []string{
- "cp -f $1 $2",
- }
- if !reflect.DeepEqual(rule.Commands(), wantCommands) {
- t.Errorf("\nwant commands:\n %v\ngot:\n %v", wantCommands, rule.Commands())
+ if test.strip {
+ want := `zip2zip -i $1 -o $2 -x "classes*.dex"`
+ if len(rule.Commands()) < 1 || !strings.Contains(rule.Commands()[0], want) {
+ t.Errorf("\nwant commands[0] to have:\n %v\ngot:\n %v", want, rule.Commands()[0])
+ }
+ } else {
+ wantCommands := []string{
+ "cp -f $1 $2",
+ }
+ if !reflect.DeepEqual(rule.Commands(), wantCommands) {
+ t.Errorf("\nwant commands:\n %v\ngot:\n %v", wantCommands, rule.Commands())
+ }
+ }
+ })
}
}
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..4bae78a 100644
--- a/java/app.go
+++ b/java/app.go
@@ -184,6 +184,11 @@
// TODO: LOCAL_PACKAGE_OVERRIDES
// $(addprefix --rename-manifest-package , $(PRIVATE_MANIFEST_PACKAGE_NAME)) \
+ manifestPackageName, overridden := ctx.DeviceConfig().OverrideManifestPackageNameFor(ctx.ModuleName())
+ if overridden {
+ linkFlags = append(linkFlags, "--rename-manifest-package "+manifestPackageName)
+ }
+
a.aapt.buildActions(ctx, sdkContext(a), linkFlags...)
// apps manifests are handled by aapt, don't let Module see them
@@ -213,7 +218,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)
@@ -259,6 +263,20 @@
packageFile := android.PathForModuleOut(ctx, "package.apk")
CreateAppPackage(ctx, packageFile, a.exportPackage, jniJarFile, dexJarFile, certificates)
+
+ if !a.Module.Platform() {
+ certPath := a.certificate.Pem.String()
+ systemCertPath := ctx.Config().DefaultAppCertificateDir(ctx).String()
+ if strings.HasPrefix(certPath, systemCertPath) {
+ enforceSystemCert := ctx.Config().EnforceSystemCertificate()
+ whitelist := ctx.Config().EnforceSystemCertificateWhitelist()
+
+ if enforceSystemCert && !inList(a.Module.Name(), whitelist) {
+ ctx.PropertyErrorf("certificate", "The module in product partition cannot be signed with certificate in system.")
+ }
+ }
+ }
+
a.outputFile = packageFile
bundleFile := android.PathForModuleOut(ctx, "base.zip")
diff --git a/java/dexpreopt.go b/java/dexpreopt.go
index de9c5f3..2c8de55 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
}
@@ -42,6 +43,9 @@
// true.
Enabled *bool
+ // If true, never strip the dex files from the final jar when dexpreopting. Defaults to false.
+ No_stripping *bool
+
// If true, generate an app image (.art file) for this module.
App_image *bool
@@ -74,6 +78,10 @@
return true
}
+ if !d.isInstallable {
+ return true
+ }
+
// TODO: contains no java code
return false
@@ -140,19 +148,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,
@@ -172,6 +174,7 @@
NoCreateAppImage: !BoolDefault(d.dexpreoptProperties.Dex_preopt.App_image, true),
ForceCreateAppImage: BoolDefault(d.dexpreoptProperties.Dex_preopt.App_image, false),
+ NoStripping: Bool(d.dexpreoptProperties.Dex_preopt.No_stripping),
StripInputPath: dexJarFile.String(),
StripOutputPath: strippedDexJarFile.String(),
}
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..fa4aee4 100644
--- a/java/java.go
+++ b/java/java.go
@@ -430,154 +430,6 @@
return j.sdkVersion()
}
-type sdkContext interface {
- // sdkVersion eturns the sdk_version property of the current module, or an empty string if it is not set.
- sdkVersion() string
- // minSdkVersion returns the min_sdk_version property of the current module, or sdkVersion() if it is not set.
- minSdkVersion() string
- // targetSdkVersion returns the target_sdk_version property of the current module, or sdkVersion() if it is not set.
- targetSdkVersion() string
-}
-
-func sdkVersionOrDefault(ctx android.BaseContext, v string) string {
- switch v {
- case "", "current", "system_current", "test_current", "core_current":
- return ctx.Config().DefaultAppTargetSdk()
- default:
- return v
- }
-}
-
-// Returns a sdk version as a number. For modules targeting an unreleased SDK (meaning it does not yet have a number)
-// it returns android.FutureApiLevel (10000).
-func sdkVersionToNumber(ctx android.BaseContext, v string) (int, error) {
- switch v {
- case "", "current", "test_current", "system_current", "core_current":
- return ctx.Config().DefaultAppTargetSdkInt(), nil
- default:
- n := android.GetNumericSdkVersion(v)
- if i, err := strconv.Atoi(n); err != nil {
- return -1, fmt.Errorf("invalid sdk version %q", n)
- } else {
- return i, nil
- }
- }
-}
-
-func sdkVersionToNumberAsString(ctx android.BaseContext, v string) (string, error) {
- n, err := sdkVersionToNumber(ctx, v)
- if err != nil {
- return "", err
- }
- return strconv.Itoa(n), nil
-}
-
-func decodeSdkDep(ctx android.BaseContext, sdkContext sdkContext) sdkDep {
- v := sdkContext.sdkVersion()
- i, err := sdkVersionToNumber(ctx, v)
- if err != nil {
- ctx.PropertyErrorf("sdk_version", "%s", err)
- return sdkDep{}
- }
-
- // Ensures that the specificed system SDK version is one of BOARD_SYSTEMSDK_VERSIONS (for vendor apks)
- // or PRODUCT_SYSTEMSDK_VERSIONS (for other apks or when BOARD_SYSTEMSDK_VERSIONS is not set)
- if strings.HasPrefix(v, "system_") && i != android.FutureApiLevel {
- allowed_versions := ctx.DeviceConfig().PlatformSystemSdkVersions()
- if ctx.DeviceSpecific() || ctx.SocSpecific() {
- if len(ctx.DeviceConfig().SystemSdkVersions()) > 0 {
- allowed_versions = ctx.DeviceConfig().SystemSdkVersions()
- }
- }
- version := strings.TrimPrefix(v, "system_")
- if len(allowed_versions) > 0 && !android.InList(version, allowed_versions) {
- ctx.PropertyErrorf("sdk_version", "incompatible sdk version %q. System SDK version should be one of %q",
- v, allowed_versions)
- }
- }
-
- toPrebuilt := func(sdk string) sdkDep {
- var api, v string
- if strings.Contains(sdk, "_") {
- t := strings.Split(sdk, "_")
- api = t[0]
- v = t[1]
- } else {
- api = "public"
- v = sdk
- }
- dir := filepath.Join("prebuilts", "sdk", v, api)
- jar := filepath.Join(dir, "android.jar")
- // There's no aidl for other SDKs yet.
- // TODO(77525052): Add aidl files for other SDKs too.
- public_dir := filepath.Join("prebuilts", "sdk", v, "public")
- aidl := filepath.Join(public_dir, "framework.aidl")
- jarPath := android.ExistentPathForSource(ctx, jar)
- aidlPath := android.ExistentPathForSource(ctx, aidl)
- lambdaStubsPath := android.PathForSource(ctx, config.SdkLambdaStubsPath)
-
- if (!jarPath.Valid() || !aidlPath.Valid()) && ctx.Config().AllowMissingDependencies() {
- return sdkDep{
- invalidVersion: true,
- modules: []string{fmt.Sprintf("sdk_%s_%s_android", api, v)},
- }
- }
-
- if !jarPath.Valid() {
- ctx.PropertyErrorf("sdk_version", "invalid sdk version %q, %q does not exist", v, jar)
- return sdkDep{}
- }
-
- if !aidlPath.Valid() {
- ctx.PropertyErrorf("sdk_version", "invalid sdk version %q, %q does not exist", v, aidl)
- return sdkDep{}
- }
-
- return sdkDep{
- useFiles: true,
- jars: android.Paths{jarPath.Path(), lambdaStubsPath},
- aidl: aidlPath.Path(),
- }
- }
-
- toModule := func(m, r string) sdkDep {
- ret := sdkDep{
- useModule: true,
- modules: []string{m, config.DefaultLambdaStubsLibrary},
- systemModules: m + "_system_modules",
- frameworkResModule: r,
- }
- if m == "core.current.stubs" {
- ret.systemModules = "core-system-modules"
- } else if m == "core.platform.api.stubs" {
- ret.systemModules = "core-platform-api-stubs-system-modules"
- }
- return ret
- }
-
- if ctx.Config().UnbundledBuildPrebuiltSdks() && v != "" {
- return toPrebuilt(v)
- }
-
- switch v {
- case "":
- return sdkDep{
- useDefaultLibs: true,
- frameworkResModule: "framework-res",
- }
- case "current":
- return toModule("android_stubs_current", "framework-res")
- case "system_current":
- return toModule("android_system_stubs_current", "framework-res")
- case "test_current":
- return toModule("android_test_stubs_current", "framework-res")
- case "core_current":
- return toModule("core.current.stubs", "")
- default:
- return toPrebuilt(v)
- }
-}
-
func (j *Module) deps(ctx android.BottomUpMutatorContext) {
if ctx.Device() {
if !Bool(j.properties.No_standard_libs) {
@@ -925,7 +777,18 @@
func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext sdkContext) string {
var ret string
- sdk, err := sdkVersionToNumber(ctx, sdkContext.sdkVersion())
+ v := sdkContext.sdkVersion()
+ // For PDK builds, use the latest SDK version instead of "current"
+ if ctx.Config().IsPdkBuild() && (v == "" || v == "current") {
+ sdkVersions := ctx.Config().Get(sdkSingletonKey).([]int)
+ latestSdkVersion := 0
+ if len(sdkVersions) > 0 {
+ latestSdkVersion = sdkVersions[len(sdkVersions)-1]
+ }
+ v = strconv.Itoa(latestSdkVersion)
+ }
+
+ sdk, err := sdkVersionToNumber(ctx, v)
if err != nil {
ctx.PropertyErrorf("sdk_version", "%s", err)
}
@@ -1326,6 +1189,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 +1363,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 +1471,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..570efb7 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -19,13 +19,10 @@
"io/ioutil"
"os"
"path/filepath"
- "reflect"
"strconv"
"strings"
"testing"
- "github.com/google/blueprint/proptools"
-
"android/soong/android"
"android/soong/cc"
"android/soong/genrule"
@@ -76,9 +73,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))
@@ -98,6 +98,7 @@
ctx.TopDown("java_sdk_library", sdkLibraryMutator).Parallel()
})
ctx.RegisterPreSingletonType("overlay", android.SingletonFactoryAdaptor(OverlaySingletonFactory))
+ ctx.RegisterPreSingletonType("sdk", android.SingletonFactoryAdaptor(sdkSingletonFactory))
// Register module types and mutators from cc needed for JNI testing
ctx.RegisterModuleType("cc_library", android.ModuleFactoryAdaptor(cc.LibraryFactory))
@@ -181,6 +182,9 @@
"prebuilts/sdk/14/public/android.jar": nil,
"prebuilts/sdk/14/public/framework.aidl": nil,
"prebuilts/sdk/14/system/android.jar": nil,
+ "prebuilts/sdk/17/public/android.jar": nil,
+ "prebuilts/sdk/17/public/framework.aidl": nil,
+ "prebuilts/sdk/17/system/android.jar": nil,
"prebuilts/sdk/current/core/android.jar": nil,
"prebuilts/sdk/current/public/android.jar": nil,
"prebuilts/sdk/current/public/framework.aidl": nil,
@@ -351,241 +355,6 @@
}
-var classpathTestcases = []struct {
- name string
- unbundled bool
- moduleType string
- host android.OsClass
- properties string
- bootclasspath []string
- system string
- classpath []string
-}{
- {
- name: "default",
- bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"},
- system: "core-platform-api-stubs-system-modules",
- classpath: []string{"ext", "framework"},
- },
- {
- name: "blank sdk version",
- properties: `sdk_version: "",`,
- bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"},
- system: "core-platform-api-stubs-system-modules",
- classpath: []string{"ext", "framework"},
- },
- {
-
- name: "sdk v14",
- properties: `sdk_version: "14",`,
- bootclasspath: []string{`""`},
- system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
- classpath: []string{"prebuilts/sdk/14/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
- },
- {
-
- name: "current",
- properties: `sdk_version: "current",`,
- bootclasspath: []string{"android_stubs_current", "core-lambda-stubs"},
- system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
- },
- {
-
- name: "system_current",
- properties: `sdk_version: "system_current",`,
- bootclasspath: []string{"android_system_stubs_current", "core-lambda-stubs"},
- system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
- },
- {
-
- name: "system_14",
- properties: `sdk_version: "system_14",`,
- bootclasspath: []string{`""`},
- system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
- classpath: []string{"prebuilts/sdk/14/system/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
- },
- {
-
- name: "test_current",
- properties: `sdk_version: "test_current",`,
- bootclasspath: []string{"android_test_stubs_current", "core-lambda-stubs"},
- system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
- },
- {
-
- name: "core_current",
- properties: `sdk_version: "core_current",`,
- bootclasspath: []string{"core.current.stubs", "core-lambda-stubs"},
- system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
- },
- {
-
- name: "nostdlib",
- properties: `no_standard_libs: true, system_modules: "none"`,
- system: "none",
- bootclasspath: []string{`""`},
- classpath: []string{},
- },
- {
-
- name: "nostdlib system_modules",
- properties: `no_standard_libs: true, system_modules: "core-platform-api-stubs-system-modules"`,
- system: "core-platform-api-stubs-system-modules",
- bootclasspath: []string{`""`},
- classpath: []string{},
- },
- {
-
- name: "host default",
- moduleType: "java_library_host",
- properties: ``,
- host: android.Host,
- bootclasspath: []string{"jdk8/jre/lib/jce.jar", "jdk8/jre/lib/rt.jar"},
- classpath: []string{},
- },
- {
- name: "host nostdlib",
- moduleType: "java_library_host",
- host: android.Host,
- properties: `no_standard_libs: true`,
- classpath: []string{},
- },
- {
-
- name: "host supported default",
- host: android.Host,
- properties: `host_supported: true,`,
- classpath: []string{},
- bootclasspath: []string{"jdk8/jre/lib/jce.jar", "jdk8/jre/lib/rt.jar"},
- },
- {
- name: "host supported nostdlib",
- host: android.Host,
- properties: `host_supported: true, no_standard_libs: true, system_modules: "none"`,
- classpath: []string{},
- },
- {
-
- name: "unbundled sdk v14",
- unbundled: true,
- properties: `sdk_version: "14",`,
- bootclasspath: []string{`""`},
- system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
- classpath: []string{"prebuilts/sdk/14/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
- },
- {
-
- name: "unbundled current",
- unbundled: true,
- properties: `sdk_version: "current",`,
- bootclasspath: []string{`""`},
- system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
- classpath: []string{"prebuilts/sdk/current/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
- },
-}
-
-func TestClasspath(t *testing.T) {
- for _, testcase := range classpathTestcases {
- t.Run(testcase.name, func(t *testing.T) {
- moduleType := "java_library"
- if testcase.moduleType != "" {
- moduleType = testcase.moduleType
- }
-
- bp := moduleType + ` {
- name: "foo",
- srcs: ["a.java"],
- ` + testcase.properties + `
- }`
-
- variant := "android_common"
- if testcase.host == android.Host {
- variant = android.BuildOs.String() + "_common"
- }
-
- convertModulesToPaths := func(cp []string) []string {
- ret := make([]string, len(cp))
- for i, e := range cp {
- ret[i] = moduleToPath(e)
- }
- return ret
- }
-
- bootclasspath := convertModulesToPaths(testcase.bootclasspath)
- classpath := convertModulesToPaths(testcase.classpath)
-
- bc := strings.Join(bootclasspath, ":")
- if bc != "" {
- bc = "-bootclasspath " + bc
- }
-
- c := strings.Join(classpath, ":")
- if c != "" {
- c = "-classpath " + c
- }
- system := ""
- if testcase.system == "none" {
- system = "--system=none"
- } else if testcase.system != "" {
- system = "--system=" + filepath.Join(buildDir, ".intermediates", testcase.system, "android_common", "system") + "/"
- }
-
- t.Run("1.8", func(t *testing.T) {
- // Test default javac 1.8
- config := testConfig(nil)
- if testcase.unbundled {
- config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true)
- }
- ctx := testContext(config, bp, nil)
- run(t, ctx, config)
-
- javac := ctx.ModuleForTests("foo", variant).Rule("javac")
-
- got := javac.Args["bootClasspath"]
- if got != bc {
- t.Errorf("bootclasspath expected %q != got %q", bc, got)
- }
-
- got = javac.Args["classpath"]
- if got != c {
- t.Errorf("classpath expected %q != got %q", c, got)
- }
-
- var deps []string
- if len(bootclasspath) > 0 && bootclasspath[0] != `""` {
- deps = append(deps, bootclasspath...)
- }
- deps = append(deps, classpath...)
-
- if !reflect.DeepEqual(javac.Implicits.Strings(), deps) {
- t.Errorf("implicits expected %q != got %q", deps, javac.Implicits.Strings())
- }
- })
-
- // Test again with javac 1.9
- t.Run("1.9", func(t *testing.T) {
- config := testConfig(map[string]string{"EXPERIMENTAL_USE_OPENJDK9": "true"})
- if testcase.unbundled {
- config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true)
- }
- ctx := testContext(config, bp, nil)
- run(t, ctx, config)
-
- javac := ctx.ModuleForTests("foo", variant).Rule("javac")
- got := javac.Args["bootClasspath"]
- expected := system
- if testcase.system == "bootclasspath" {
- expected = bc
- }
- if got != expected {
- t.Errorf("bootclasspath expected %q != got %q", expected, got)
- }
- })
- })
- }
-
-}
-
func TestPrebuilts(t *testing.T) {
ctx := testJava(t, `
java_library {
diff --git a/java/sdk.go b/java/sdk.go
new file mode 100644
index 0000000..988610f
--- /dev/null
+++ b/java/sdk.go
@@ -0,0 +1,218 @@
+// Copyright 2019 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 (
+ "android/soong/android"
+ "android/soong/java/config"
+ "fmt"
+ "path/filepath"
+ "sort"
+ "strconv"
+ "strings"
+)
+
+func init() {
+ android.RegisterPreSingletonType("sdk", sdkSingletonFactory)
+}
+
+const sdkSingletonKey = "sdkSingletonKey"
+
+type sdkContext interface {
+ // sdkVersion eturns the sdk_version property of the current module, or an empty string if it is not set.
+ sdkVersion() string
+ // minSdkVersion returns the min_sdk_version property of the current module, or sdkVersion() if it is not set.
+ minSdkVersion() string
+ // targetSdkVersion returns the target_sdk_version property of the current module, or sdkVersion() if it is not set.
+ targetSdkVersion() string
+}
+
+func sdkVersionOrDefault(ctx android.BaseContext, v string) string {
+ switch v {
+ case "", "current", "system_current", "test_current", "core_current":
+ return ctx.Config().DefaultAppTargetSdk()
+ default:
+ return v
+ }
+}
+
+// Returns a sdk version as a number. For modules targeting an unreleased SDK (meaning it does not yet have a number)
+// it returns android.FutureApiLevel (10000).
+func sdkVersionToNumber(ctx android.BaseContext, v string) (int, error) {
+ switch v {
+ case "", "current", "test_current", "system_current", "core_current":
+ return ctx.Config().DefaultAppTargetSdkInt(), nil
+ default:
+ n := android.GetNumericSdkVersion(v)
+ if i, err := strconv.Atoi(n); err != nil {
+ return -1, fmt.Errorf("invalid sdk version %q", n)
+ } else {
+ return i, nil
+ }
+ }
+}
+
+func sdkVersionToNumberAsString(ctx android.BaseContext, v string) (string, error) {
+ n, err := sdkVersionToNumber(ctx, v)
+ if err != nil {
+ return "", err
+ }
+ return strconv.Itoa(n), nil
+}
+
+func decodeSdkDep(ctx android.BaseContext, sdkContext sdkContext) sdkDep {
+ v := sdkContext.sdkVersion()
+ // For PDK builds, use the latest SDK version instead of "current"
+ if ctx.Config().IsPdkBuild() && (v == "" || v == "current") {
+ sdkVersions := ctx.Config().Get(sdkSingletonKey).([]int)
+ latestSdkVersion := 0
+ if len(sdkVersions) > 0 {
+ latestSdkVersion = sdkVersions[len(sdkVersions)-1]
+ }
+ v = strconv.Itoa(latestSdkVersion)
+ }
+
+ i, err := sdkVersionToNumber(ctx, v)
+ if err != nil {
+ ctx.PropertyErrorf("sdk_version", "%s", err)
+ return sdkDep{}
+ }
+
+ toPrebuilt := func(sdk string) sdkDep {
+ var api, v string
+ if strings.Contains(sdk, "_") {
+ t := strings.Split(sdk, "_")
+ api = t[0]
+ v = t[1]
+ } else {
+ api = "public"
+ v = sdk
+ }
+ dir := filepath.Join("prebuilts", "sdk", v, api)
+ jar := filepath.Join(dir, "android.jar")
+ // There's no aidl for other SDKs yet.
+ // TODO(77525052): Add aidl files for other SDKs too.
+ public_dir := filepath.Join("prebuilts", "sdk", v, "public")
+ aidl := filepath.Join(public_dir, "framework.aidl")
+ jarPath := android.ExistentPathForSource(ctx, jar)
+ aidlPath := android.ExistentPathForSource(ctx, aidl)
+ lambdaStubsPath := android.PathForSource(ctx, config.SdkLambdaStubsPath)
+
+ if (!jarPath.Valid() || !aidlPath.Valid()) && ctx.Config().AllowMissingDependencies() {
+ return sdkDep{
+ invalidVersion: true,
+ modules: []string{fmt.Sprintf("sdk_%s_%s_android", api, v)},
+ }
+ }
+
+ if !jarPath.Valid() {
+ ctx.PropertyErrorf("sdk_version", "invalid sdk version %q, %q does not exist", v, jar)
+ return sdkDep{}
+ }
+
+ if !aidlPath.Valid() {
+ ctx.PropertyErrorf("sdk_version", "invalid sdk version %q, %q does not exist", v, aidl)
+ return sdkDep{}
+ }
+
+ return sdkDep{
+ useFiles: true,
+ jars: android.Paths{jarPath.Path(), lambdaStubsPath},
+ aidl: aidlPath.Path(),
+ }
+ }
+
+ toModule := func(m, r string) sdkDep {
+ ret := sdkDep{
+ useModule: true,
+ modules: []string{m, config.DefaultLambdaStubsLibrary},
+ systemModules: m + "_system_modules",
+ frameworkResModule: r,
+ }
+ if m == "core.current.stubs" {
+ ret.systemModules = "core-system-modules"
+ } else if m == "core.platform.api.stubs" {
+ ret.systemModules = "core-platform-api-stubs-system-modules"
+ }
+ return ret
+ }
+
+ // Ensures that the specificed system SDK version is one of BOARD_SYSTEMSDK_VERSIONS (for vendor apks)
+ // or PRODUCT_SYSTEMSDK_VERSIONS (for other apks or when BOARD_SYSTEMSDK_VERSIONS is not set)
+ if strings.HasPrefix(v, "system_") && i != android.FutureApiLevel {
+ allowed_versions := ctx.DeviceConfig().PlatformSystemSdkVersions()
+ if ctx.DeviceSpecific() || ctx.SocSpecific() {
+ if len(ctx.DeviceConfig().SystemSdkVersions()) > 0 {
+ allowed_versions = ctx.DeviceConfig().SystemSdkVersions()
+ }
+ }
+ version := strings.TrimPrefix(v, "system_")
+ if len(allowed_versions) > 0 && !android.InList(version, allowed_versions) {
+ ctx.PropertyErrorf("sdk_version", "incompatible sdk version %q. System SDK version should be one of %q",
+ v, allowed_versions)
+ }
+ }
+
+ if ctx.Config().UnbundledBuildPrebuiltSdks() && v != "" {
+ return toPrebuilt(v)
+ }
+
+ switch v {
+ case "":
+ return sdkDep{
+ useDefaultLibs: true,
+ frameworkResModule: "framework-res",
+ }
+ case "current":
+ return toModule("android_stubs_current", "framework-res")
+ case "system_current":
+ return toModule("android_system_stubs_current", "framework-res")
+ case "test_current":
+ return toModule("android_test_stubs_current", "framework-res")
+ case "core_current":
+ return toModule("core.current.stubs", "")
+ default:
+ return toPrebuilt(v)
+ }
+}
+
+func sdkSingletonFactory() android.Singleton {
+ return sdkSingleton{}
+}
+
+type sdkSingleton struct{}
+
+func (sdkSingleton) GenerateBuildActions(ctx android.SingletonContext) {
+ sdkJars, err := ctx.GlobWithDeps("prebuilts/sdk/*/public/android.jar", nil)
+ if err != nil {
+ ctx.Errorf("failed to glob prebuilts/sdk/*/public/android.jar: %s", err.Error())
+ }
+
+ var sdkVersions []int
+ for _, sdkJar := range sdkJars {
+ dir := filepath.Base(filepath.Dir(filepath.Dir(sdkJar)))
+ v, err := strconv.Atoi(dir)
+ if scerr, ok := err.(*strconv.NumError); ok && scerr.Err == strconv.ErrSyntax {
+ continue
+ } else if err != nil {
+ ctx.Errorf("invalid sdk jar %q, %s, %v", sdkJar, err.Error())
+ }
+ sdkVersions = append(sdkVersions, v)
+ }
+
+ sort.Ints(sdkVersions)
+
+ ctx.Config().Once(sdkSingletonKey, func() interface{} { return sdkVersions })
+}
diff --git a/java/sdk_test.go b/java/sdk_test.go
new file mode 100644
index 0000000..6924e26
--- /dev/null
+++ b/java/sdk_test.go
@@ -0,0 +1,291 @@
+// Copyright 2019 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 (
+ "android/soong/android"
+ "path/filepath"
+ "reflect"
+ "strings"
+ "testing"
+
+ "github.com/google/blueprint/proptools"
+)
+
+var classpathTestcases = []struct {
+ name string
+ unbundled bool
+ pdk bool
+ moduleType string
+ host android.OsClass
+ properties string
+ bootclasspath []string
+ system string
+ classpath []string
+}{
+ {
+ name: "default",
+ bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"},
+ system: "core-platform-api-stubs-system-modules",
+ classpath: []string{"ext", "framework"},
+ },
+ {
+ name: "blank sdk version",
+ properties: `sdk_version: "",`,
+ bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"},
+ system: "core-platform-api-stubs-system-modules",
+ classpath: []string{"ext", "framework"},
+ },
+ {
+
+ name: "sdk v14",
+ properties: `sdk_version: "14",`,
+ bootclasspath: []string{`""`},
+ system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
+ classpath: []string{"prebuilts/sdk/14/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
+ },
+ {
+
+ name: "current",
+ properties: `sdk_version: "current",`,
+ bootclasspath: []string{"android_stubs_current", "core-lambda-stubs"},
+ system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
+ },
+ {
+
+ name: "system_current",
+ properties: `sdk_version: "system_current",`,
+ bootclasspath: []string{"android_system_stubs_current", "core-lambda-stubs"},
+ system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
+ },
+ {
+
+ name: "system_14",
+ properties: `sdk_version: "system_14",`,
+ bootclasspath: []string{`""`},
+ system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
+ classpath: []string{"prebuilts/sdk/14/system/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
+ },
+ {
+
+ name: "test_current",
+ properties: `sdk_version: "test_current",`,
+ bootclasspath: []string{"android_test_stubs_current", "core-lambda-stubs"},
+ system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
+ },
+ {
+
+ name: "core_current",
+ properties: `sdk_version: "core_current",`,
+ bootclasspath: []string{"core.current.stubs", "core-lambda-stubs"},
+ system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
+ },
+ {
+
+ name: "nostdlib",
+ properties: `no_standard_libs: true, system_modules: "none"`,
+ system: "none",
+ bootclasspath: []string{`""`},
+ classpath: []string{},
+ },
+ {
+
+ name: "nostdlib system_modules",
+ properties: `no_standard_libs: true, system_modules: "core-platform-api-stubs-system-modules"`,
+ system: "core-platform-api-stubs-system-modules",
+ bootclasspath: []string{`""`},
+ classpath: []string{},
+ },
+ {
+
+ name: "host default",
+ moduleType: "java_library_host",
+ properties: ``,
+ host: android.Host,
+ bootclasspath: []string{"jdk8/jre/lib/jce.jar", "jdk8/jre/lib/rt.jar"},
+ classpath: []string{},
+ },
+ {
+ name: "host nostdlib",
+ moduleType: "java_library_host",
+ host: android.Host,
+ properties: `no_standard_libs: true`,
+ classpath: []string{},
+ },
+ {
+
+ name: "host supported default",
+ host: android.Host,
+ properties: `host_supported: true,`,
+ classpath: []string{},
+ bootclasspath: []string{"jdk8/jre/lib/jce.jar", "jdk8/jre/lib/rt.jar"},
+ },
+ {
+ name: "host supported nostdlib",
+ host: android.Host,
+ properties: `host_supported: true, no_standard_libs: true, system_modules: "none"`,
+ classpath: []string{},
+ },
+ {
+
+ name: "unbundled sdk v14",
+ unbundled: true,
+ properties: `sdk_version: "14",`,
+ bootclasspath: []string{`""`},
+ system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
+ classpath: []string{"prebuilts/sdk/14/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
+ },
+ {
+
+ name: "unbundled current",
+ unbundled: true,
+ properties: `sdk_version: "current",`,
+ bootclasspath: []string{`""`},
+ system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
+ classpath: []string{"prebuilts/sdk/current/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
+ },
+
+ {
+ name: "pdk default",
+ pdk: true,
+ bootclasspath: []string{`""`},
+ system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
+ classpath: []string{"prebuilts/sdk/17/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
+ },
+ {
+ name: "pdk current",
+ pdk: true,
+ properties: `sdk_version: "current",`,
+ bootclasspath: []string{`""`},
+ system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
+ classpath: []string{"prebuilts/sdk/17/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
+ },
+ {
+ name: "pdk 14",
+ pdk: true,
+ properties: `sdk_version: "14",`,
+ bootclasspath: []string{`""`},
+ system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
+ classpath: []string{"prebuilts/sdk/14/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},
+ },
+}
+
+func TestClasspath(t *testing.T) {
+ for _, testcase := range classpathTestcases {
+ t.Run(testcase.name, func(t *testing.T) {
+ moduleType := "java_library"
+ if testcase.moduleType != "" {
+ moduleType = testcase.moduleType
+ }
+
+ bp := moduleType + ` {
+ name: "foo",
+ srcs: ["a.java"],
+ ` + testcase.properties + `
+ }`
+
+ variant := "android_common"
+ if testcase.host == android.Host {
+ variant = android.BuildOs.String() + "_common"
+ }
+
+ convertModulesToPaths := func(cp []string) []string {
+ ret := make([]string, len(cp))
+ for i, e := range cp {
+ ret[i] = moduleToPath(e)
+ }
+ return ret
+ }
+
+ bootclasspath := convertModulesToPaths(testcase.bootclasspath)
+ classpath := convertModulesToPaths(testcase.classpath)
+
+ bc := strings.Join(bootclasspath, ":")
+ if bc != "" {
+ bc = "-bootclasspath " + bc
+ }
+
+ c := strings.Join(classpath, ":")
+ if c != "" {
+ c = "-classpath " + c
+ }
+ system := ""
+ if testcase.system == "none" {
+ system = "--system=none"
+ } else if testcase.system != "" {
+ system = "--system=" + filepath.Join(buildDir, ".intermediates", testcase.system, "android_common", "system") + "/"
+ }
+
+ t.Run("1.8", func(t *testing.T) {
+ // Test default javac 1.8
+ config := testConfig(nil)
+ if testcase.unbundled {
+ config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true)
+ }
+ if testcase.pdk {
+ config.TestProductVariables.Pdk = proptools.BoolPtr(true)
+ }
+ ctx := testContext(config, bp, nil)
+ run(t, ctx, config)
+
+ javac := ctx.ModuleForTests("foo", variant).Rule("javac")
+
+ got := javac.Args["bootClasspath"]
+ if got != bc {
+ t.Errorf("bootclasspath expected %q != got %q", bc, got)
+ }
+
+ got = javac.Args["classpath"]
+ if got != c {
+ t.Errorf("classpath expected %q != got %q", c, got)
+ }
+
+ var deps []string
+ if len(bootclasspath) > 0 && bootclasspath[0] != `""` {
+ deps = append(deps, bootclasspath...)
+ }
+ deps = append(deps, classpath...)
+
+ if !reflect.DeepEqual(javac.Implicits.Strings(), deps) {
+ t.Errorf("implicits expected %q != got %q", deps, javac.Implicits.Strings())
+ }
+ })
+
+ // Test again with javac 1.9
+ t.Run("1.9", func(t *testing.T) {
+ config := testConfig(map[string]string{"EXPERIMENTAL_USE_OPENJDK9": "true"})
+ if testcase.unbundled {
+ config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true)
+ }
+ if testcase.pdk {
+ config.TestProductVariables.Pdk = proptools.BoolPtr(true)
+ }
+ ctx := testContext(config, bp, nil)
+ run(t, ctx, config)
+
+ javac := ctx.ModuleForTests("foo", variant).Rule("javac")
+ got := javac.Args["bootClasspath"]
+ expected := system
+ if testcase.system == "bootclasspath" {
+ expected = bc
+ }
+ if got != expected {
+ t.Errorf("bootclasspath expected %q != got %q", expected, got)
+ }
+ })
+ })
+ }
+
+}
diff --git a/ui/build/Android.bp b/ui/build/Android.bp
index 0eba5ce..1ddaf68 100644
--- a/ui/build/Android.bp
+++ b/ui/build/Android.bp
@@ -47,6 +47,7 @@
"environment.go",
"exec.go",
"finder.go",
+ "goma.go",
"kati.go",
"ninja.go",
"path.go",
diff --git a/ui/build/build.go b/ui/build/build.go
index c902a0f..0ae06d6 100644
--- a/ui/build/build.go
+++ b/ui/build/build.go
@@ -156,6 +156,11 @@
SetupPath(ctx, config)
+ if config.StartGoma() {
+ // Ensure start Goma compiler_proxy
+ startGoma(ctx, config)
+ }
+
if what&BuildProductConfig != 0 {
// Run make for product config
runMakeProductConfig(ctx, config)
diff --git a/ui/build/config.go b/ui/build/config.go
index 97b009a..64270f8 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -478,6 +478,20 @@
return false
}
+func (c *configImpl) StartGoma() bool {
+ if !c.UseGoma() {
+ return false
+ }
+
+ if v, ok := c.environ.Get("NOSTART_GOMA"); ok {
+ v = strings.TrimSpace(v)
+ if v != "" && v != "false" {
+ return false
+ }
+ }
+ return true
+}
+
// RemoteParallel controls how many remote jobs (i.e., commands which contain
// gomacc) are run in parallel. Note the parallelism of all other jobs is
// still limited by Parallel()
diff --git a/ui/build/goma.go b/ui/build/goma.go
new file mode 100644
index 0000000..d0dc9cf
--- /dev/null
+++ b/ui/build/goma.go
@@ -0,0 +1,48 @@
+// 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 build
+
+import (
+ "errors"
+ "path/filepath"
+
+ "android/soong/ui/metrics"
+)
+
+const gomaCtlScript = "goma_ctl.py"
+
+var gomaCtlNotFound = errors.New("goma_ctl.py not found")
+
+func startGoma(ctx Context, config Config) error {
+ ctx.BeginTrace(metrics.RunSetupTool, "goma_ctl")
+ defer ctx.EndTrace()
+
+ var gomaCtl string
+ if gomaDir, ok := config.Environment().Get("GOMA_DIR"); ok {
+ gomaCtl = filepath.Join(gomaDir, gomaCtlScript)
+ } else if home, ok := config.Environment().Get("HOME"); ok {
+ gomaCtl = filepath.Join(home, "goma", gomaCtlScript)
+ } else {
+ return gomaCtlNotFound
+ }
+
+ cmd := Command(ctx, config, "goma_ctl.py ensure_start", gomaCtl, "ensure_start")
+
+ if err := cmd.Run(); err != nil {
+ ctx.Fatalf("goma_ctl.py ensure_start failed with: %v", err)
+ }
+
+ return nil
+}
diff --git a/ui/build/kati.go b/ui/build/kati.go
index 205d5ae..439c928 100644
--- a/ui/build/kati.go
+++ b/ui/build/kati.go
@@ -18,6 +18,8 @@
"crypto/md5"
"fmt"
"io/ioutil"
+ "os"
+ "os/user"
"path/filepath"
"strings"
@@ -96,6 +98,22 @@
envFunc(cmd.Environment)
+ if _, ok := cmd.Environment.Get("BUILD_USERNAME"); !ok {
+ u, err := user.Current()
+ if err != nil {
+ ctx.Println("Failed to get current user")
+ }
+ cmd.Environment.Set("BUILD_USERNAME", u.Username)
+ }
+
+ if _, ok := cmd.Environment.Get("BUILD_HOSTNAME"); !ok {
+ hostname, err := os.Hostname()
+ if err != nil {
+ ctx.Println("Failed to read hostname")
+ }
+ cmd.Environment.Set("BUILD_HOSTNAME", hostname)
+ }
+
cmd.StartOrFatal()
status.KatiReader(ctx.Status.StartTool(), pipe)
cmd.WaitOrFatal()
diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go
index e2e4368..87f1e4e 100644
--- a/ui/build/paths/config.go
+++ b/ui/build/paths/config.go
@@ -78,15 +78,11 @@
"bash": Allowed,
"bc": Allowed,
"bzip2": Allowed,
- "chmod": Allowed,
"cp": Allowed,
"date": Allowed,
"dd": Allowed,
"diff": Allowed,
- "du": Allowed,
- "echo": Allowed,
"egrep": Allowed,
- "expr": Allowed,
"find": Allowed,
"fuser": Allowed,
"getconf": Allowed,
@@ -99,7 +95,6 @@
"jar": Allowed,
"java": Allowed,
"javap": Allowed,
- "ln": Allowed,
"ls": Allowed,
"lsof": Allowed,
"m4": Allowed,
@@ -154,13 +149,18 @@
// On linux we'll use the toybox version of these instead
"basename": Toybox,
"cat": Toybox,
+ "chmod": Toybox,
"cmp": Toybox,
"comm": Toybox,
"cut": Toybox,
"dirname": Toybox,
+ "du": Toybox,
+ "echo": Toybox,
"env": Toybox,
+ "expr": Toybox,
"head": Toybox,
"id": Toybox,
+ "ln": Toybox,
"mkdir": Toybox,
"od": Toybox,
"paste": Toybox,