diff options
-rw-r--r-- | Android.bp | 3 | ||||
-rw-r--r-- | apex/apex.go | 2 | ||||
-rw-r--r-- | apex/builder.go | 5 | ||||
-rw-r--r-- | apex/vndk.go | 10 | ||||
-rw-r--r-- | cmd/release_config/release_config_contributions/main.go | 2 | ||||
-rw-r--r-- | compliance/Android.bp | 1 | ||||
-rw-r--r-- | java/builder.go | 1 |
7 files changed, 15 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp index ab8e4a086..d71bcecd8 100644 --- a/Android.bp +++ b/Android.bp @@ -142,12 +142,10 @@ all_apex_contributions { visibility: ["//visibility:public"], } -// TODO(b/365670526): remove the cuttlefish visibility once it is fully removed product_config { name: "product_config", visibility: [ "//build/make/target/product/generic", - "//device/google/cuttlefish/system_image", ], } @@ -158,7 +156,6 @@ build_prop { // Currently, only microdroid and cf system image can refer to system-build.prop visibility: [ "//build/make/target/product/generic", - "//device/google/cuttlefish/system_image", "//packages/modules/Virtualization/build/microdroid", ], } diff --git a/apex/apex.go b/apex/apex.go index fd6f5b5ab..d7dc6d718 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -395,7 +395,7 @@ type overridableProperties struct { // Apex Container package name. Override value for attribute package:name in // AndroidManifest.xml - Package_name string + Package_name proptools.Configurable[string] // A txt file containing list of files that are allowed to be included in this APEX. Allowed_files *string `android:"path"` diff --git a/apex/builder.go b/apex/builder.go index 4db20e986..371d7d527 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -1074,8 +1074,9 @@ func (a *apexBundle) getOverrideManifestPackageName(ctx android.ModuleContext) s } return "" } - if a.overridableProperties.Package_name != "" { - return a.overridableProperties.Package_name + packageNameFromProp := a.overridableProperties.Package_name.GetOrDefault(ctx, "") + if packageNameFromProp != "" { + return packageNameFromProp } manifestPackageName, overridden := ctx.DeviceConfig().OverrideManifestPackageNameFor(ctx.ModuleName()) if overridden { diff --git a/apex/vndk.go b/apex/vndk.go index 3ececc5c1..5e630c0c0 100644 --- a/apex/vndk.go +++ b/apex/vndk.go @@ -20,6 +20,7 @@ import ( "android/soong/android" "android/soong/cc" + "github.com/google/blueprint" "github.com/google/blueprint/proptools" ) @@ -66,7 +67,14 @@ func apexVndkDepsMutator(mctx android.BottomUpMutatorContext) { vndkApexName := "com.android.vndk." + vndkVersion if mctx.OtherModuleExists(vndkApexName) { - mctx.AddReverseDependency(mctx.Module(), sharedLibTag, vndkApexName) + // Reverse dependencies must exactly specify the variant they want, starting from the + // current module's variant. But unlike cc modules, the vndk apex doesn't have + // arch/image/link variations, so we explicitly remove them here. + mctx.AddReverseVariationDependency([]blueprint.Variation{ + {Mutator: "arch", Variation: "common"}, + {Mutator: "image", Variation: ""}, + {Mutator: "link", Variation: ""}, + }, sharedLibTag, vndkApexName) } } else if a, ok := mctx.Module().(*apexBundle); ok && a.vndkApex { if a.IsNativeBridgeSupported() { diff --git a/cmd/release_config/release_config_contributions/main.go b/cmd/release_config/release_config_contributions/main.go index 6abf768da..a954cf159 100644 --- a/cmd/release_config/release_config_contributions/main.go +++ b/cmd/release_config/release_config_contributions/main.go @@ -114,7 +114,7 @@ func main() { } for _, name := range releaseConfigNames { dirs := contributingDirsMap[name] - slices.Sort(dirs) + sortDirectories(dirs) message.ReleaseConfigContributionsArtifactList = append( message.ReleaseConfigContributionsArtifactList, &rc_proto.ReleaseConfigContributionsArtifact{ diff --git a/compliance/Android.bp b/compliance/Android.bp index 80f56857f..72c2f27c1 100644 --- a/compliance/Android.bp +++ b/compliance/Android.bp @@ -35,6 +35,5 @@ notice_xml { partition_name: "system", visibility: [ "//build/make/target/product/generic", - "//device/google/cuttlefish/system_image", ], } diff --git a/java/builder.go b/java/builder.go index 81b0feb75..6144832b3 100644 --- a/java/builder.go +++ b/java/builder.go @@ -703,6 +703,7 @@ func TransformJarsToJar(ctx android.ModuleContext, outputFile android.WritablePa // Remove any module-info.class files that may have come from prebuilt jars, they cause problems // for downstream tools like desugar. jarArgs = append(jarArgs, "-stripFile module-info.class") + jarArgs = append(jarArgs, "-stripFile META-INF/versions/*/module-info.class") if stripDirEntries { jarArgs = append(jarArgs, "-D") |