Cherrypick aosp/1318079 and aosp/1324841
Allow apex module to have android_app_set as its constituent. Fix android_app_set documentation Fixes: 157166068 Test: treehugger & manual Change-Id: I9f91f1b761286f489d175eb0772f78f702e8a2d6 Merged-In: I9f91f1b761286f489d175eb0772f78f702e8a2d6 Merged-In: Id9b296d9301902deb463b299413491bc66d58944
This commit is contained in:
@@ -79,7 +79,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, fi := range a.filesInfo {
|
for _, fi := range a.filesInfo {
|
||||||
if cc, ok := fi.module.(*cc.Module); ok && cc.Properties.HideFromMake {
|
if ccMod, ok := fi.module.(*cc.Module); ok && ccMod.Properties.HideFromMake {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -165,7 +165,8 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
|
|||||||
if fi.jacocoReportClassesFile != nil {
|
if fi.jacocoReportClassesFile != nil {
|
||||||
fmt.Fprintln(w, "LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=", fi.jacocoReportClassesFile.String())
|
fmt.Fprintln(w, "LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=", fi.jacocoReportClassesFile.String())
|
||||||
}
|
}
|
||||||
if fi.class == javaSharedLib {
|
switch fi.class {
|
||||||
|
case javaSharedLib:
|
||||||
javaModule := fi.module.(java.Dependency)
|
javaModule := fi.module.(java.Dependency)
|
||||||
// soong_java_prebuilt.mk sets LOCAL_MODULE_SUFFIX := .jar Therefore
|
// soong_java_prebuilt.mk sets LOCAL_MODULE_SUFFIX := .jar Therefore
|
||||||
// we need to remove the suffix from LOCAL_MODULE_STEM, otherwise
|
// we need to remove the suffix from LOCAL_MODULE_STEM, otherwise
|
||||||
@@ -176,7 +177,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
|
|||||||
fmt.Fprintln(w, "LOCAL_SOONG_DEX_JAR :=", fi.builtFile.String())
|
fmt.Fprintln(w, "LOCAL_SOONG_DEX_JAR :=", fi.builtFile.String())
|
||||||
fmt.Fprintln(w, "LOCAL_DEX_PREOPT := false")
|
fmt.Fprintln(w, "LOCAL_DEX_PREOPT := false")
|
||||||
fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_java_prebuilt.mk")
|
fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_java_prebuilt.mk")
|
||||||
} else if fi.class == app {
|
case app:
|
||||||
fmt.Fprintln(w, "LOCAL_CERTIFICATE :=", fi.certificate.AndroidMkString())
|
fmt.Fprintln(w, "LOCAL_CERTIFICATE :=", fi.certificate.AndroidMkString())
|
||||||
// soong_app_prebuilt.mk sets LOCAL_MODULE_SUFFIX := .apk Therefore
|
// soong_app_prebuilt.mk sets LOCAL_MODULE_SUFFIX := .apk Therefore
|
||||||
// we need to remove the suffix from LOCAL_MODULE_STEM, otherwise
|
// we need to remove the suffix from LOCAL_MODULE_STEM, otherwise
|
||||||
@@ -186,19 +187,26 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
|
|||||||
fmt.Fprintln(w, "LOCAL_PREBUILT_COVERAGE_ARCHIVE :=", strings.Join(app.JniCoverageOutputs().Strings(), " "))
|
fmt.Fprintln(w, "LOCAL_PREBUILT_COVERAGE_ARCHIVE :=", strings.Join(app.JniCoverageOutputs().Strings(), " "))
|
||||||
}
|
}
|
||||||
fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_app_prebuilt.mk")
|
fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_app_prebuilt.mk")
|
||||||
} else if fi.class == nativeSharedLib || fi.class == nativeExecutable || fi.class == nativeTest {
|
case appSet:
|
||||||
|
as, ok := fi.module.(*java.AndroidAppSet)
|
||||||
|
if !ok {
|
||||||
|
panic(fmt.Sprintf("Expected %s to be AndroidAppSet", fi.module))
|
||||||
|
}
|
||||||
|
fmt.Fprintln(w, "LOCAL_APK_SET_MASTER_FILE :=", as.MasterFile())
|
||||||
|
fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_android_app_set.mk")
|
||||||
|
case nativeSharedLib, nativeExecutable, nativeTest:
|
||||||
fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.Stem())
|
fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.Stem())
|
||||||
if cc, ok := fi.module.(*cc.Module); ok {
|
if ccMod, ok := fi.module.(*cc.Module); ok {
|
||||||
if cc.UnstrippedOutputFile() != nil {
|
if ccMod.UnstrippedOutputFile() != nil {
|
||||||
fmt.Fprintln(w, "LOCAL_SOONG_UNSTRIPPED_BINARY :=", cc.UnstrippedOutputFile().String())
|
fmt.Fprintln(w, "LOCAL_SOONG_UNSTRIPPED_BINARY :=", ccMod.UnstrippedOutputFile().String())
|
||||||
}
|
}
|
||||||
cc.AndroidMkWriteAdditionalDependenciesForSourceAbiDiff(w)
|
ccMod.AndroidMkWriteAdditionalDependenciesForSourceAbiDiff(w)
|
||||||
if cc.CoverageOutputFile().Valid() {
|
if ccMod.CoverageOutputFile().Valid() {
|
||||||
fmt.Fprintln(w, "LOCAL_PREBUILT_COVERAGE_ARCHIVE :=", cc.CoverageOutputFile().String())
|
fmt.Fprintln(w, "LOCAL_PREBUILT_COVERAGE_ARCHIVE :=", ccMod.CoverageOutputFile().String())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_cc_prebuilt.mk")
|
fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_cc_prebuilt.mk")
|
||||||
} else {
|
default:
|
||||||
fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.Stem())
|
fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.Stem())
|
||||||
if fi.builtFile == a.manifestPbOut && apexType == flattenedApex {
|
if fi.builtFile == a.manifestPbOut && apexType == flattenedApex {
|
||||||
if a.primaryApexType {
|
if a.primaryApexType {
|
||||||
|
12
apex/apex.go
12
apex/apex.go
@@ -1150,6 +1150,7 @@ const (
|
|||||||
javaSharedLib
|
javaSharedLib
|
||||||
nativeTest
|
nativeTest
|
||||||
app
|
app
|
||||||
|
appSet
|
||||||
)
|
)
|
||||||
|
|
||||||
func (class apexFileClass) NameInMake() string {
|
func (class apexFileClass) NameInMake() string {
|
||||||
@@ -1164,7 +1165,7 @@ func (class apexFileClass) NameInMake() string {
|
|||||||
return "JAVA_LIBRARIES"
|
return "JAVA_LIBRARIES"
|
||||||
case nativeTest:
|
case nativeTest:
|
||||||
return "NATIVE_TESTS"
|
return "NATIVE_TESTS"
|
||||||
case app:
|
case app, appSet:
|
||||||
// b/142537672 Why isn't this APP? We want to have full control over
|
// b/142537672 Why isn't this APP? We want to have full control over
|
||||||
// the paths and file names of the apk file under the flattend APEX.
|
// the paths and file names of the apk file under the flattend APEX.
|
||||||
// If this is set to APP, then the paths and file names are modified
|
// If this is set to APP, then the paths and file names are modified
|
||||||
@@ -1981,6 +1982,15 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|||||||
filesInfo = append(filesInfo, apexFileForAndroidApp(ctx, ap))
|
filesInfo = append(filesInfo, apexFileForAndroidApp(ctx, ap))
|
||||||
} else if ap, ok := child.(*java.AndroidTestHelperApp); ok {
|
} else if ap, ok := child.(*java.AndroidTestHelperApp); ok {
|
||||||
filesInfo = append(filesInfo, apexFileForAndroidApp(ctx, ap))
|
filesInfo = append(filesInfo, apexFileForAndroidApp(ctx, ap))
|
||||||
|
} else if ap, ok := child.(*java.AndroidAppSet); ok {
|
||||||
|
appDir := "app"
|
||||||
|
if ap.Privileged() {
|
||||||
|
appDir = "priv-app"
|
||||||
|
}
|
||||||
|
af := newApexFile(ctx, ap.OutputFile(), ap.Name(),
|
||||||
|
filepath.Join(appDir, ap.BaseModuleName()), appSet, ap)
|
||||||
|
af.certificate = java.PresignedCertificate
|
||||||
|
filesInfo = append(filesInfo, af)
|
||||||
} else {
|
} else {
|
||||||
ctx.PropertyErrorf("apps", "%q is not an android_app module", depName)
|
ctx.PropertyErrorf("apps", "%q is not an android_app module", depName)
|
||||||
}
|
}
|
||||||
|
@@ -97,15 +97,15 @@ func withManifestPackageNameOverrides(specs []string) testCustomizer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func withBinder32bit(fs map[string][]byte, config android.Config) {
|
func withBinder32bit(_ map[string][]byte, config android.Config) {
|
||||||
config.TestProductVariables.Binder32bit = proptools.BoolPtr(true)
|
config.TestProductVariables.Binder32bit = proptools.BoolPtr(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
func withUnbundledBuild(fs map[string][]byte, config android.Config) {
|
func withUnbundledBuild(_ map[string][]byte, config android.Config) {
|
||||||
config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true)
|
config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
func testApexContext(t *testing.T, bp string, handlers ...testCustomizer) (*android.TestContext, android.Config) {
|
func testApexContext(_ *testing.T, bp string, handlers ...testCustomizer) (*android.TestContext, android.Config) {
|
||||||
android.ClearApexDependency()
|
android.ClearApexDependency()
|
||||||
|
|
||||||
bp = bp + `
|
bp = bp + `
|
||||||
@@ -166,6 +166,7 @@ func testApexContext(t *testing.T, bp string, handlers ...testCustomizer) (*andr
|
|||||||
"build/make/core/proguard.flags": nil,
|
"build/make/core/proguard.flags": nil,
|
||||||
"build/make/core/proguard_basic_keeps.flags": nil,
|
"build/make/core/proguard_basic_keeps.flags": nil,
|
||||||
"dummy.txt": nil,
|
"dummy.txt": nil,
|
||||||
|
"AppSet.apks": nil,
|
||||||
}
|
}
|
||||||
|
|
||||||
cc.GatherRequiredFilesForTest(fs)
|
cc.GatherRequiredFilesForTest(fs)
|
||||||
@@ -237,7 +238,7 @@ func setUp() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func tearDown() {
|
func tearDown() {
|
||||||
os.RemoveAll(buildDir)
|
_ = os.RemoveAll(buildDir)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ensure that 'result' contains 'expected'
|
// ensure that 'result' contains 'expected'
|
||||||
@@ -256,6 +257,17 @@ func ensureNotContains(t *testing.T, result string, notExpected string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func ensureMatches(t *testing.T, result string, expectedRex string) {
|
||||||
|
ok, err := regexp.MatchString(expectedRex, result)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("regexp failure trying to match %s against `%s` expression: %s", result, expectedRex, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
t.Errorf("%s does not match regular expession %s", result, expectedRex)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func ensureListContains(t *testing.T, result []string, expected string) {
|
func ensureListContains(t *testing.T, result []string, expected string) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
if !android.InList(expected, result) {
|
if !android.InList(expected, result) {
|
||||||
@@ -4444,6 +4456,38 @@ func TestAppBundle(t *testing.T) {
|
|||||||
ensureContains(t, content, `"apex_config":{"apex_embedded_apk_config":[{"package_name":"com.android.foo","path":"app/AppFoo/AppFoo.apk"}]}`)
|
ensureContains(t, content, `"apex_config":{"apex_embedded_apk_config":[{"package_name":"com.android.foo","path":"app/AppFoo/AppFoo.apk"}]}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestAppSetBundle(t *testing.T) {
|
||||||
|
ctx, _ := testApex(t, `
|
||||||
|
apex {
|
||||||
|
name: "myapex",
|
||||||
|
key: "myapex.key",
|
||||||
|
apps: ["AppSet"],
|
||||||
|
}
|
||||||
|
|
||||||
|
apex_key {
|
||||||
|
name: "myapex.key",
|
||||||
|
public_key: "testkey.avbpubkey",
|
||||||
|
private_key: "testkey.pem",
|
||||||
|
}
|
||||||
|
|
||||||
|
android_app_set {
|
||||||
|
name: "AppSet",
|
||||||
|
set: "AppSet.apks",
|
||||||
|
}`)
|
||||||
|
mod := ctx.ModuleForTests("myapex", "android_common_myapex_image")
|
||||||
|
bundleConfigRule := mod.Description("Bundle Config")
|
||||||
|
content := bundleConfigRule.Args["content"]
|
||||||
|
ensureContains(t, content, `"compression":{"uncompressed_glob":["apex_payload.img","apex_manifest.*"]}`)
|
||||||
|
s := mod.Rule("apexRule").Args["copy_commands"]
|
||||||
|
copyCmds := regexp.MustCompile(" *&& *").Split(s, -1)
|
||||||
|
if len(copyCmds) != 3 {
|
||||||
|
t.Fatalf("Expected 3 commands, got %d in:\n%s", len(copyCmds), s)
|
||||||
|
}
|
||||||
|
ensureMatches(t, copyCmds[0], "^rm -rf .*/app/AppSet$")
|
||||||
|
ensureMatches(t, copyCmds[1], "^mkdir -p .*/app/AppSet$")
|
||||||
|
ensureMatches(t, copyCmds[2], "^unzip .*-d .*/app/AppSet .*/AppSet.zip$")
|
||||||
|
}
|
||||||
|
|
||||||
func testNoUpdatableJarsInBootImage(t *testing.T, errmsg, bp string, transformDexpreoptConfig func(*dexpreopt.GlobalConfig)) {
|
func testNoUpdatableJarsInBootImage(t *testing.T, errmsg, bp string, transformDexpreoptConfig func(*dexpreopt.GlobalConfig)) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
|
|
||||||
|
@@ -69,11 +69,14 @@ var (
|
|||||||
// by default set to (uid/gid/mode) = (1000/1000/0644)
|
// by default set to (uid/gid/mode) = (1000/1000/0644)
|
||||||
// TODO(b/113082813) make this configurable using config.fs syntax
|
// TODO(b/113082813) make this configurable using config.fs syntax
|
||||||
generateFsConfig = pctx.StaticRule("generateFsConfig", blueprint.RuleParams{
|
generateFsConfig = pctx.StaticRule("generateFsConfig", blueprint.RuleParams{
|
||||||
Command: `echo '/ 1000 1000 0755' > ${out} && ` +
|
Command: `( echo '/ 1000 1000 0755' ` +
|
||||||
`echo ${ro_paths} | tr ' ' '\n' | awk '{print "/"$$1 " 1000 1000 0644"}' >> ${out} && ` +
|
`&& for i in ${ro_paths}; do echo "/$$i 1000 1000 0644"; done ` +
|
||||||
`echo ${exec_paths} | tr ' ' '\n' | awk '{print "/"$$1 " 0 2000 0755"}' >> ${out}`,
|
`&& for i in ${exec_paths}; do echo "/$$i 0 2000 0755"; done ` +
|
||||||
Description: "fs_config ${out}",
|
`&& ( tr ' ' '\n' <${out}.apklist | for i in ${apk_paths}; do read apk; echo "/$$i 0 2000 0755"; zipinfo -1 $$apk | sed "s:\(.*\):/$$i/\1 1000 1000 0644:"; done ) ) > ${out}`,
|
||||||
}, "ro_paths", "exec_paths")
|
Description: "fs_config ${out}",
|
||||||
|
Rspfile: "$out.apklist",
|
||||||
|
RspfileContent: "$in",
|
||||||
|
}, "ro_paths", "exec_paths", "apk_paths")
|
||||||
|
|
||||||
apexManifestRule = pctx.StaticRule("apexManifestRule", blueprint.RuleParams{
|
apexManifestRule = pctx.StaticRule("apexManifestRule", blueprint.RuleParams{
|
||||||
Command: `rm -f $out && ${jsonmodify} $in ` +
|
Command: `rm -f $out && ${jsonmodify} $in ` +
|
||||||
@@ -278,7 +281,7 @@ func (a *apexBundle) buildBundleConfig(ctx android.ModuleContext) android.Output
|
|||||||
// collect the manifest names and paths of android apps
|
// collect the manifest names and paths of android apps
|
||||||
// if their manifest names are overridden
|
// if their manifest names are overridden
|
||||||
for _, fi := range a.filesInfo {
|
for _, fi := range a.filesInfo {
|
||||||
if fi.class != app {
|
if fi.class != app && fi.class != appSet {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
packageName := fi.overriddenPackageName
|
packageName := fi.overriddenPackageName
|
||||||
@@ -328,13 +331,22 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
|
|||||||
var copyCommands []string
|
var copyCommands []string
|
||||||
for _, fi := range a.filesInfo {
|
for _, fi := range a.filesInfo {
|
||||||
destPath := android.PathForModuleOut(ctx, "image"+suffix, fi.Path()).String()
|
destPath := android.PathForModuleOut(ctx, "image"+suffix, fi.Path()).String()
|
||||||
copyCommands = append(copyCommands, "mkdir -p "+filepath.Dir(destPath))
|
destPathDir := filepath.Dir(destPath)
|
||||||
|
if fi.class == appSet {
|
||||||
|
copyCommands = append(copyCommands, "rm -rf "+destPathDir)
|
||||||
|
}
|
||||||
|
copyCommands = append(copyCommands, "mkdir -p "+destPathDir)
|
||||||
if a.linkToSystemLib && fi.transitiveDep && fi.AvailableToPlatform() {
|
if a.linkToSystemLib && fi.transitiveDep && fi.AvailableToPlatform() {
|
||||||
// TODO(jiyong): pathOnDevice should come from fi.module, not being calculated here
|
// TODO(jiyong): pathOnDevice should come from fi.module, not being calculated here
|
||||||
pathOnDevice := filepath.Join("/system", fi.Path())
|
pathOnDevice := filepath.Join("/system", fi.Path())
|
||||||
copyCommands = append(copyCommands, "ln -sfn "+pathOnDevice+" "+destPath)
|
copyCommands = append(copyCommands, "ln -sfn "+pathOnDevice+" "+destPath)
|
||||||
} else {
|
} else {
|
||||||
copyCommands = append(copyCommands, "cp -f "+fi.builtFile.String()+" "+destPath)
|
if fi.class == appSet {
|
||||||
|
copyCommands = append(copyCommands,
|
||||||
|
fmt.Sprintf("unzip -q -d %s %s", destPathDir, fi.builtFile.String()))
|
||||||
|
} else {
|
||||||
|
copyCommands = append(copyCommands, "cp -f "+fi.builtFile.String()+" "+destPath)
|
||||||
|
}
|
||||||
implicitInputs = append(implicitInputs, fi.builtFile)
|
implicitInputs = append(implicitInputs, fi.builtFile)
|
||||||
}
|
}
|
||||||
// create additional symlinks pointing the file inside the APEX
|
// create additional symlinks pointing the file inside the APEX
|
||||||
@@ -394,6 +406,8 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
|
|||||||
// files and dirs that will be created in APEX
|
// files and dirs that will be created in APEX
|
||||||
var readOnlyPaths = []string{"apex_manifest.json", "apex_manifest.pb"}
|
var readOnlyPaths = []string{"apex_manifest.json", "apex_manifest.pb"}
|
||||||
var executablePaths []string // this also includes dirs
|
var executablePaths []string // this also includes dirs
|
||||||
|
var extractedAppSetPaths android.Paths
|
||||||
|
var extractedAppSetDirs []string
|
||||||
for _, f := range a.filesInfo {
|
for _, f := range a.filesInfo {
|
||||||
pathInApex := f.Path()
|
pathInApex := f.Path()
|
||||||
if f.installDir == "bin" || strings.HasPrefix(f.installDir, "bin/") {
|
if f.installDir == "bin" || strings.HasPrefix(f.installDir, "bin/") {
|
||||||
@@ -401,6 +415,9 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
|
|||||||
for _, s := range f.symlinks {
|
for _, s := range f.symlinks {
|
||||||
executablePaths = append(executablePaths, filepath.Join(f.installDir, s))
|
executablePaths = append(executablePaths, filepath.Join(f.installDir, s))
|
||||||
}
|
}
|
||||||
|
} else if f.class == appSet {
|
||||||
|
extractedAppSetPaths = append(extractedAppSetPaths, f.builtFile)
|
||||||
|
extractedAppSetDirs = append(extractedAppSetDirs, f.installDir)
|
||||||
} else {
|
} else {
|
||||||
readOnlyPaths = append(readOnlyPaths, pathInApex)
|
readOnlyPaths = append(readOnlyPaths, pathInApex)
|
||||||
}
|
}
|
||||||
@@ -421,9 +438,11 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
|
|||||||
Rule: generateFsConfig,
|
Rule: generateFsConfig,
|
||||||
Output: cannedFsConfig,
|
Output: cannedFsConfig,
|
||||||
Description: "generate fs config",
|
Description: "generate fs config",
|
||||||
|
Inputs: extractedAppSetPaths,
|
||||||
Args: map[string]string{
|
Args: map[string]string{
|
||||||
"ro_paths": strings.Join(readOnlyPaths, " "),
|
"ro_paths": strings.Join(readOnlyPaths, " "),
|
||||||
"exec_paths": strings.Join(executablePaths, " "),
|
"exec_paths": strings.Join(executablePaths, " "),
|
||||||
|
"apk_paths": strings.Join(extractedAppSetDirs, " "),
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
45
java/app.go
45
java/app.go
@@ -96,6 +96,14 @@ func (as *AndroidAppSet) Privileged() bool {
|
|||||||
return Bool(as.properties.Privileged)
|
return Bool(as.properties.Privileged)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (as *AndroidAppSet) OutputFile() android.Path {
|
||||||
|
return as.packedOutput
|
||||||
|
}
|
||||||
|
|
||||||
|
func (as *AndroidAppSet) MasterFile() string {
|
||||||
|
return as.masterFile
|
||||||
|
}
|
||||||
|
|
||||||
var TargetCpuAbi = map[string]string{
|
var TargetCpuAbi = map[string]string{
|
||||||
"arm": "ARMEABI_V7A",
|
"arm": "ARMEABI_V7A",
|
||||||
"arm64": "ARM64_V8A",
|
"arm64": "ARM64_V8A",
|
||||||
@@ -120,7 +128,7 @@ func SupportedAbis(ctx android.ModuleContext) []string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (as *AndroidAppSet) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
func (as *AndroidAppSet) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||||
as.packedOutput = android.PathForModuleOut(ctx, "extracted.zip")
|
as.packedOutput = android.PathForModuleOut(ctx, ctx.ModuleName()+".zip")
|
||||||
// We are assuming here that the master file in the APK
|
// We are assuming here that the master file in the APK
|
||||||
// set has `.apk` suffix. If it doesn't the build will fail.
|
// set has `.apk` suffix. If it doesn't the build will fail.
|
||||||
// APK sets containing APEX files are handled elsewhere.
|
// APK sets containing APEX files are handled elsewhere.
|
||||||
@@ -145,26 +153,17 @@ func (as *AndroidAppSet) GenerateAndroidBuildActions(ctx android.ModuleContext)
|
|||||||
"stem": ctx.ModuleName(),
|
"stem": ctx.ModuleName(),
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
// TODO(asmundak): add this (it's wrong now, will cause copying extracted.zip)
|
|
||||||
/*
|
|
||||||
var installDir android.InstallPath
|
|
||||||
if Bool(as.properties.Privileged) {
|
|
||||||
installDir = android.PathForModuleInstall(ctx, "priv-app", as.BaseModuleName())
|
|
||||||
} else if ctx.InstallInTestcases() {
|
|
||||||
installDir = android.PathForModuleInstall(ctx, as.BaseModuleName(), ctx.DeviceConfig().DeviceArch())
|
|
||||||
} else {
|
|
||||||
installDir = android.PathForModuleInstall(ctx, "app", as.BaseModuleName())
|
|
||||||
}
|
|
||||||
ctx.InstallFile(installDir, as.masterFile", as.packedOutput)
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// android_app_set extracts a set of APKs based on the target device
|
// android_app_set extracts a set of APKs based on the target device
|
||||||
// configuration and installs this set as "split APKs".
|
// configuration and installs this set as "split APKs".
|
||||||
// The set will always contain `base-master.apk` and every APK built
|
// The extracted set always contains 'master' APK whose name is
|
||||||
// to the target device. All density-specific APK will be included, too,
|
// _module_name_.apk and every split APK matching target device.
|
||||||
// unless PRODUCT_APPT_PREBUILT_DPI is defined (should contain comma-sepearated
|
// The extraction of the density-specific splits depends on
|
||||||
// list of density names (LDPI, MDPI, HDPI, etc.)
|
// PRODUCT_AAPT_PREBUILT_DPI variable. If present (its value should
|
||||||
|
// be a list density names: LDPI, MDPI, HDPI, etc.), only listed
|
||||||
|
// splits will be extracted. Otherwise all density-specific splits
|
||||||
|
// will be extracted.
|
||||||
func AndroidApkSetFactory() android.Module {
|
func AndroidApkSetFactory() android.Module {
|
||||||
module := &AndroidAppSet{}
|
module := &AndroidAppSet{}
|
||||||
module.AddProperties(&module.properties)
|
module.AddProperties(&module.properties)
|
||||||
@@ -335,7 +334,7 @@ type Certificate struct {
|
|||||||
presigned bool
|
presigned bool
|
||||||
}
|
}
|
||||||
|
|
||||||
var presignedCertificate = Certificate{presigned: true}
|
var PresignedCertificate = Certificate{presigned: true}
|
||||||
|
|
||||||
func (c Certificate) AndroidMkString() string {
|
func (c Certificate) AndroidMkString() string {
|
||||||
if c.presigned {
|
if c.presigned {
|
||||||
@@ -1196,7 +1195,7 @@ type OverrideAndroidApp struct {
|
|||||||
android.OverrideModuleBase
|
android.OverrideModuleBase
|
||||||
}
|
}
|
||||||
|
|
||||||
func (i *OverrideAndroidApp) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
func (i *OverrideAndroidApp) GenerateAndroidBuildActions(_ android.ModuleContext) {
|
||||||
// All the overrides happen in the base module.
|
// All the overrides happen in the base module.
|
||||||
// TODO(jungjw): Check the base module type.
|
// TODO(jungjw): Check the base module type.
|
||||||
}
|
}
|
||||||
@@ -1217,7 +1216,7 @@ type OverrideAndroidTest struct {
|
|||||||
android.OverrideModuleBase
|
android.OverrideModuleBase
|
||||||
}
|
}
|
||||||
|
|
||||||
func (i *OverrideAndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
func (i *OverrideAndroidTest) GenerateAndroidBuildActions(_ android.ModuleContext) {
|
||||||
// All the overrides happen in the base module.
|
// All the overrides happen in the base module.
|
||||||
// TODO(jungjw): Check the base module type.
|
// TODO(jungjw): Check the base module type.
|
||||||
}
|
}
|
||||||
@@ -1239,7 +1238,7 @@ type OverrideRuntimeResourceOverlay struct {
|
|||||||
android.OverrideModuleBase
|
android.OverrideModuleBase
|
||||||
}
|
}
|
||||||
|
|
||||||
func (i *OverrideRuntimeResourceOverlay) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
func (i *OverrideRuntimeResourceOverlay) GenerateAndroidBuildActions(_ android.ModuleContext) {
|
||||||
// All the overrides happen in the base module.
|
// All the overrides happen in the base module.
|
||||||
// TODO(jungjw): Check the base module type.
|
// TODO(jungjw): Check the base module type.
|
||||||
}
|
}
|
||||||
@@ -1483,7 +1482,7 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext
|
|||||||
// Sign or align the package if package has not been preprocessed
|
// Sign or align the package if package has not been preprocessed
|
||||||
if a.preprocessed {
|
if a.preprocessed {
|
||||||
a.outputFile = srcApk
|
a.outputFile = srcApk
|
||||||
a.certificate = presignedCertificate
|
a.certificate = PresignedCertificate
|
||||||
} else if !Bool(a.properties.Presigned) {
|
} else if !Bool(a.properties.Presigned) {
|
||||||
// If the certificate property is empty at this point, default_dev_cert must be set to true.
|
// If the certificate property is empty at this point, default_dev_cert must be set to true.
|
||||||
// Which makes processMainCert's behavior for the empty cert string WAI.
|
// Which makes processMainCert's behavior for the empty cert string WAI.
|
||||||
@@ -1503,7 +1502,7 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext
|
|||||||
alignedApk := android.PathForModuleOut(ctx, "zip-aligned", apkFilename)
|
alignedApk := android.PathForModuleOut(ctx, "zip-aligned", apkFilename)
|
||||||
TransformZipAlign(ctx, alignedApk, dexOutput)
|
TransformZipAlign(ctx, alignedApk, dexOutput)
|
||||||
a.outputFile = alignedApk
|
a.outputFile = alignedApk
|
||||||
a.certificate = presignedCertificate
|
a.certificate = PresignedCertificate
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Optionally compress the output apk.
|
// TODO: Optionally compress the output apk.
|
||||||
|
@@ -149,7 +149,7 @@ func TestAndroidAppSet(t *testing.T) {
|
|||||||
prerelease: true,
|
prerelease: true,
|
||||||
}`)
|
}`)
|
||||||
module := ctx.ModuleForTests("foo", "android_common")
|
module := ctx.ModuleForTests("foo", "android_common")
|
||||||
const packedSplitApks = "extracted.zip"
|
const packedSplitApks = "foo.zip"
|
||||||
params := module.Output(packedSplitApks)
|
params := module.Output(packedSplitApks)
|
||||||
if params.Rule == nil {
|
if params.Rule == nil {
|
||||||
t.Errorf("expected output %s is missing", packedSplitApks)
|
t.Errorf("expected output %s is missing", packedSplitApks)
|
||||||
@@ -218,7 +218,7 @@ func TestAndroidAppSet_Variants(t *testing.T) {
|
|||||||
ctx := testContext()
|
ctx := testContext()
|
||||||
run(t, ctx, config)
|
run(t, ctx, config)
|
||||||
module := ctx.ModuleForTests("foo", "android_common")
|
module := ctx.ModuleForTests("foo", "android_common")
|
||||||
const packedSplitApks = "extracted.zip"
|
const packedSplitApks = "foo.zip"
|
||||||
params := module.Output(packedSplitApks)
|
params := module.Output(packedSplitApks)
|
||||||
for k, v := range test.expected {
|
for k, v := range test.expected {
|
||||||
if actual := params.Args[k]; actual != v {
|
if actual := params.Args[k]; actual != v {
|
||||||
|
Reference in New Issue
Block a user