Merge "Add -faddrsig to ClangExtraCflags"
diff --git a/android/util.go b/android/util.go
index 8fc159d..f9dce6f 100644
--- a/android/util.go
+++ b/android/util.go
@@ -15,6 +15,8 @@
package android
import (
+ "fmt"
+ "regexp"
"runtime"
"sort"
"strings"
@@ -164,12 +166,17 @@
panic("not called from an init func")
}
- if funcName == "init" || strings.HasPrefix(funcName, "init·") {
+ if funcName == "init" || strings.HasPrefix(funcName, "init·") ||
+ strings.HasPrefix(funcName, "init.") {
return
}
}
}
+// A regex to find a package path within a function name. It finds the shortest string that is
+// followed by '.' and doesn't have any '/'s left.
+var pkgPathRe = regexp.MustCompile(`^(.*?)\.([^/]+)$`)
+
// callerName returns the package path and function name of the calling
// function. The skip argument has the same meaning as the skip argument of
// runtime.Callers.
@@ -180,25 +187,13 @@
return "", "", false
}
- f := runtime.FuncForPC(pc[0])
- fullName := f.Name()
-
- lastDotIndex := strings.LastIndex(fullName, ".")
- if lastDotIndex == -1 {
- panic("unable to distinguish function name from package")
+ f := runtime.FuncForPC(pc[0]).Name()
+ s := pkgPathRe.FindStringSubmatch(f)
+ if len(s) < 3 {
+ panic(fmt.Errorf("failed to extract package path and function name from %q", f))
}
- if fullName[lastDotIndex-1] == ')' {
- // The caller is a method on some type, so it's name looks like
- // "pkg/path.(type).method". We need to go back one dot farther to get
- // to the package name.
- lastDotIndex = strings.LastIndex(fullName[:lastDotIndex], ".")
- }
-
- pkgPath = fullName[:lastDotIndex]
- funcName = fullName[lastDotIndex+1:]
- ok = true
- return
+ return s[1], s[2], true
}
func GetNumericSdkVersion(v string) string {
diff --git a/apex/apex.go b/apex/apex.go
index a70a37b..04b70d4 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -218,6 +218,10 @@
// If unspecified, a default one is automatically generated.
AndroidManifest *string `android:"path"`
+ // Canonical name of the APEX bundle in the manifest file.
+ // If unspecified, defaults to the value of name
+ Apex_name *string
+
// Determines the file contexts file for setting security context to each file in this APEX bundle.
// Specifically, when this is set to <value>, /system/sepolicy/apex/<value>_file_contexts file is
// used.
@@ -1063,17 +1067,19 @@
fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)")
fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
fmt.Fprintln(w, "LOCAL_MODULE :=", fi.moduleName)
+ // /apex/<name>/{lib|framework|...}
+ pathWhenActivated := filepath.Join("$(PRODUCT_OUT)", "apex",
+ proptools.StringDefault(a.properties.Apex_name, name), fi.installDir)
if a.flattened && apexType.image() {
// /system/apex/<name>/{lib|framework|...}
fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", filepath.Join("$(OUT_DIR)",
a.installDir.RelPathString(), name, fi.installDir))
+ fmt.Fprintln(w, "LOCAL_SOONG_SYMBOL_PATH :=", pathWhenActivated)
if len(fi.symlinks) > 0 {
fmt.Fprintln(w, "LOCAL_MODULE_SYMLINKS :=", strings.Join(fi.symlinks, " "))
}
} else {
- // /apex/<name>/{lib|framework|...}
- fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", filepath.Join("$(PRODUCT_OUT)",
- "apex", name, fi.installDir))
+ fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", pathWhenActivated)
}
fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", fi.builtFile.String())
fmt.Fprintln(w, "LOCAL_MODULE_CLASS :=", fi.class.NameInMake())