StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename ART release APEX to com.android.art."

Browse Source
This commit is contained in:
Martin Stjernholm
2020-10-23 10:03:24 +00:00
committed by Gerrit Code Review
parent 8f01ff814b 7f51107ee6
commit 9649748516
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/vndk.go
View File

@@ -152,7 +152,7 @@ func makeCompatSymlinks(name string, ctx android.ModuleContext) (symlinks []stri
} }
// TODO(b/124106384): Clean up compat symlinks for ART binaries. // TODO(b/124106384): Clean up compat symlinks for ART binaries.
if strings.HasPrefix(name, "com.android.art.") { if name == "com.android.art" || strings.HasPrefix(name, "com.android.art.") {
addSymlink("/apex/com.android.art/bin/dalvikvm", "$(TARGET_OUT)/bin", "dalvikvm") addSymlink("/apex/com.android.art/bin/dalvikvm", "$(TARGET_OUT)/bin", "dalvikvm")
dex2oat := "dex2oat32" dex2oat := "dex2oat32"
if ctx.Config().Android64() { if ctx.Config().Android64() {

9
cc/androidmk.go
View File

@@ -71,10 +71,11 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries {
entries := android.AndroidMkEntries{ entries := android.AndroidMkEntries{
OutputFile: c.outputFile, OutputFile: c.outputFile,
// TODO(jiyong): add the APEXes providing shared libs to the required modules // TODO(jiyong): add the APEXes providing shared libs to the required
// Currently, adding c.Properties.ApexesProvidingSharedLibs is causing multiple // modules Currently, adding c.Properties.ApexesProvidingSharedLibs is
// ART APEXes (com.android.art.debug|release) to be installed. And this // causing multiple ART APEXes (com.android.art and com.android.art.debug)
// is breaking some older devices (like marlin) where system.img is small. // to be installed. And this is breaking some older devices (like marlin)
// where system.img is small.
Required: c.Properties.AndroidMkRuntimeLibs, Required: c.Properties.AndroidMkRuntimeLibs,
Include: "$(BUILD_SYSTEM)/soong_cc_prebuilt.mk", Include: "$(BUILD_SYSTEM)/soong_cc_prebuilt.mk",

4
java/dexpreopt_bootjars.go
View File

@@ -270,7 +270,7 @@ func getBootImageJar(ctx android.SingletonContext, image *bootImageConfig, modul
apexInfo := ctx.ModuleProvider(module, android.ApexInfoProvider).(android.ApexInfo) apexInfo := ctx.ModuleProvider(module, android.ApexInfoProvider).(android.ApexInfo)
fromUpdatableApex := isApexModule && apexInfo.Updatable fromUpdatableApex := isApexModule && apexInfo.Updatable
if image.name == artBootImageName { if image.name == artBootImageName {
if isApexModule && len(apexInfo.InApexes) > 0 && allHavePrefix(apexInfo.InApexes, "com.android.art.") { if isApexModule && len(apexInfo.InApexes) > 0 && allHavePrefix(apexInfo.InApexes, "com.android.art") {
// ok: found the jar in the ART apex // ok: found the jar in the ART apex
} else if isApexModule && apexInfo.IsForPlatform() && isHostdex(module) { } else if isApexModule && apexInfo.IsForPlatform() && isHostdex(module) {
// exception (skip and continue): special "hostdex" platform variant // exception (skip and continue): special "hostdex" platform variant
@@ -301,7 +301,7 @@ func getBootImageJar(ctx android.SingletonContext, image *bootImageConfig, modul
func allHavePrefix(list []string, prefix string) bool { func allHavePrefix(list []string, prefix string) bool {
for _, s := range list { for _, s := range list {
if !strings.HasPrefix(s, prefix) { if s != prefix && !strings.HasPrefix(s, prefix+".") {
return false return false
} }
} }

4
scripts/build-mainline-modules.sh
View File

@@ -3,13 +3,13 @@
# Non exhaustive list of modules where we want prebuilts. More can be added as # Non exhaustive list of modules where we want prebuilts. More can be added as
# needed. # needed.
MAINLINE_MODULES=( MAINLINE_MODULES=(
com.android.art
com.android.art.debug com.android.art.debug
com.android.art.release
com.android.art.testing com.android.art.testing
com.android.conscrypt com.android.conscrypt
com.android.i18n
com.android.runtime com.android.runtime
com.android.tzdata com.android.tzdata
com.android.i18n
) )
# List of SDKs and module exports we know of. # List of SDKs and module exports we know of.