Merge "Allowlist test_com.android.media.swcodec"
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go
index 9cd50fa..67f3132 100644
--- a/android/allowlists/allowlists.go
+++ b/android/allowlists/allowlists.go
@@ -38,7 +38,13 @@
// allows modules to opt-in.
Bp2BuildDefaultFalseRecursively
- DEFAULT_NINJA_WEIGHT = 1000
+ // Modules with build time of more than half a minute should have high priority.
+ DEFAULT_PRIORITIZED_WEIGHT = 1000
+ // Modules with build time of more than a few minute should have higher priority.
+ HIGH_PRIORITIZED_WEIGHT = 10 * DEFAULT_PRIORITIZED_WEIGHT
+ // Modules with inputs greater than the threshold should have high priority.
+ // Adjust this threshold if there are lots of wrong predictions.
+ INPUT_SIZE_THRESHOLD = 50
)
var (
@@ -59,7 +65,9 @@
"build/bazel": Bp2BuildDefaultTrueRecursively,
"build/make/target/product/security": Bp2BuildDefaultTrue,
+ "build/make/tools/protos": Bp2BuildDefaultTrue,
"build/make/tools/releasetools": Bp2BuildDefaultTrue,
+ "build/make/tools/sbom": Bp2BuildDefaultTrue,
"build/make/tools/signapk": Bp2BuildDefaultTrue,
"build/make/tools/zipalign": Bp2BuildDefaultTrueRecursively,
"build/soong": Bp2BuildDefaultTrue,
@@ -1440,6 +1448,9 @@
"MetaDataBaseUnitTest", // depends on libstagefright
"AVCUtilsUnitTest", // depends on libstagefright
"ColorUtilsTest", // depends on libmediandk
+
+ // python_test_host with test data
+ "sbom_writers_test",
}
MixedBuildsDisabledList = []string{
@@ -1567,267 +1578,12 @@
// "libstagefright_flacdec",
// "libutils",
- // TODO(b/273282046): Make this list customizable to support various targets.
- // The list of modules which are expected to spend lots of build time.
- // With `--ninja_weight_source=soong`, ninja builds these modules and deps first.
- HugeModulesMap = map[string]int{
- "AccountManagementApp": DEFAULT_NINJA_WEIGHT,
- "ActivityManagerPerfTestsStubApp1": DEFAULT_NINJA_WEIGHT,
- "ActivityManagerPerfTestsStubApp2": DEFAULT_NINJA_WEIGHT,
- "ActivityManagerPerfTestsStubApp3": DEFAULT_NINJA_WEIGHT,
- "api-stubs-docs-non-updatable": DEFAULT_NINJA_WEIGHT,
- "AppCompatibilityTest": DEFAULT_NINJA_WEIGHT,
- "AppTransitionTests": DEFAULT_NINJA_WEIGHT,
- "art_compiler_tests": DEFAULT_NINJA_WEIGHT,
- "art.module.intra.core.api.stubs.source": DEFAULT_NINJA_WEIGHT,
- "art.module.public.api.stubs.source": DEFAULT_NINJA_WEIGHT,
- "AttestationVerificationTest": DEFAULT_NINJA_WEIGHT,
- "BatteryUsageStatsProtoTests": DEFAULT_NINJA_WEIGHT,
- "bluetooth_test_gd_unit": DEFAULT_NINJA_WEIGHT,
- "Bluetooth": DEFAULT_NINJA_WEIGHT,
- "BluetoothInstrumentationTests": DEFAULT_NINJA_WEIGHT,
- "Calendar": DEFAULT_NINJA_WEIGHT,
- "CalendarProvider": DEFAULT_NINJA_WEIGHT,
- "Camera2": DEFAULT_NINJA_WEIGHT,
- "CarRotaryControllerUnitTests": DEFAULT_NINJA_WEIGHT,
- "CarSettingsForUnitTesting": DEFAULT_NINJA_WEIGHT,
- "CarSettingsUnitTests": DEFAULT_NINJA_WEIGHT,
- "CarSystemUI-tests": DEFAULT_NINJA_WEIGHT,
- "CellBroadcastApp": DEFAULT_NINJA_WEIGHT,
- "CellBroadcastLegacyApp": DEFAULT_NINJA_WEIGHT,
- "CellBroadcastReceiverOemUnitTests": DEFAULT_NINJA_WEIGHT,
- "CellBroadcastServiceModule": DEFAULT_NINJA_WEIGHT,
- "CompanionDeviceManager": DEFAULT_NINJA_WEIGHT,
- "ConnectivityChecker": DEFAULT_NINJA_WEIGHT,
- "Contacts": DEFAULT_NINJA_WEIGHT,
- "ContactsProvider": DEFAULT_NINJA_WEIGHT,
- "ContentCapturePerfTests": DEFAULT_NINJA_WEIGHT,
- "CorePerfTests": DEFAULT_NINJA_WEIGHT,
- "crosvm": DEFAULT_NINJA_WEIGHT,
- "CtsDomainVerificationDeviceMultiUserTestCases": DEFAULT_NINJA_WEIGHT,
- "CtsLogdTestCases": DEFAULT_NINJA_WEIGHT,
- "CtsMediaProviderTranscodeTests": DEFAULT_NINJA_WEIGHT,
- "CtsRollbackManagerHostTestHelperApp": DEFAULT_NINJA_WEIGHT,
- "CtsRollbackManagerHostTestHelperApp2": DEFAULT_NINJA_WEIGHT,
- "CtsRootPackageInstallerTestCases": DEFAULT_NINJA_WEIGHT,
- "CtsRootRollbackManagerHostTestHelperApp": DEFAULT_NINJA_WEIGHT,
- "CtsTranscodeTestAppSupportsHevc": DEFAULT_NINJA_WEIGHT,
- "CtsTranscodeTestAppSupportsSlowMotion": DEFAULT_NINJA_WEIGHT,
- "CuttlefishDisplayHotplugHelperApp": DEFAULT_NINJA_WEIGHT,
- "cvd-host_package": DEFAULT_NINJA_WEIGHT,
- "DelegateTestApp": DEFAULT_NINJA_WEIGHT,
- "DeskClock": DEFAULT_NINJA_WEIGHT,
- "Development": DEFAULT_NINJA_WEIGHT,
- "DeviceAdminTestApp": DEFAULT_NINJA_WEIGHT,
- "DevicePolicyManagementRoleHolderTestApp": DEFAULT_NINJA_WEIGHT,
- "dex2oatd": DEFAULT_NINJA_WEIGHT,
- "DocumentsUI": DEFAULT_NINJA_WEIGHT,
- "EasterEgg": DEFAULT_NINJA_WEIGHT,
- "EffectProxyTest": DEFAULT_NINJA_WEIGHT,
- "EmergencyInfo": DEFAULT_NINJA_WEIGHT,
- "EmptyTestApp": DEFAULT_NINJA_WEIGHT,
- "ExtServices": DEFAULT_NINJA_WEIGHT,
- "FacebookAppsScenarioTests": DEFAULT_NINJA_WEIGHT,
- "flickerlib-core": DEFAULT_NINJA_WEIGHT,
- "flickerlib": DEFAULT_NINJA_WEIGHT,
- "FlickerLibTest": DEFAULT_NINJA_WEIGHT,
- "FlickerTests": DEFAULT_NINJA_WEIGHT,
- "framework-minus-apex": DEFAULT_NINJA_WEIGHT,
- "framework-res": DEFAULT_NINJA_WEIGHT,
- "FrameworksCoreTests": DEFAULT_NINJA_WEIGHT,
- "FrameworksMockingCoreTests": DEFAULT_NINJA_WEIGHT,
- "FrameworksMockingServicesTests": DEFAULT_NINJA_WEIGHT,
- "FrameworksNetSmokeTests": DEFAULT_NINJA_WEIGHT,
- "FrameworksNetTests": DEFAULT_NINJA_WEIGHT,
- "FrameworksServicesTests": DEFAULT_NINJA_WEIGHT,
- "FrameworksTelephonyTests": DEFAULT_NINJA_WEIGHT,
- "FrameworksUiServicesTests": DEFAULT_NINJA_WEIGHT,
- "FrameworksVcnTests": DEFAULT_NINJA_WEIGHT,
- "Gallery2": DEFAULT_NINJA_WEIGHT,
- "GameCoreDevice": DEFAULT_NINJA_WEIGHT,
- "GoogleBluetoothInstrumentationTests": DEFAULT_NINJA_WEIGHT,
- "guice_munged_srcs": DEFAULT_NINJA_WEIGHT,
- "HalfSheetUX": DEFAULT_NINJA_WEIGHT,
- "ImePerfTests": DEFAULT_NINJA_WEIGHT,
- "imgdiag": DEFAULT_NINJA_WEIGHT,
- "ImsServiceEntitlement": DEFAULT_NINJA_WEIGHT,
- "ImsServiceEntitlementUnitTests": DEFAULT_NINJA_WEIGHT,
- "InputTests": DEFAULT_NINJA_WEIGHT,
- "InstallTest": DEFAULT_NINJA_WEIGHT,
- "IntentResolver": DEFAULT_NINJA_WEIGHT,
- "JankBench": DEFAULT_NINJA_WEIGHT,
- "jsilver": DEFAULT_NINJA_WEIGHT,
- "KeyChain": DEFAULT_NINJA_WEIGHT,
- "KeyChainTests": DEFAULT_NINJA_WEIGHT,
- "keystore2": DEFAULT_NINJA_WEIGHT,
- "LargeResourcesCompressed": DEFAULT_NINJA_WEIGHT,
- "LatinIME": DEFAULT_NINJA_WEIGHT,
- "Launcher3QuickStepLib": DEFAULT_NINJA_WEIGHT,
- "libaom": DEFAULT_NINJA_WEIGHT,
- "libart-broken": DEFAULT_NINJA_WEIGHT,
- "libart-compiler": DEFAULT_NINJA_WEIGHT,
- "libart-disassembler": DEFAULT_NINJA_WEIGHT,
- "libart": DEFAULT_NINJA_WEIGHT,
- "libartd": DEFAULT_NINJA_WEIGHT,
- "libaudiohal@7.1": DEFAULT_NINJA_WEIGHT,
- "libbluetooth_core_rs": DEFAULT_NINJA_WEIGHT,
- "libbluetooth_gd_unit_tests": DEFAULT_NINJA_WEIGHT,
- "libbluetooth_gd": DEFAULT_NINJA_WEIGHT,
- "libbluetooth_rs": DEFAULT_NINJA_WEIGHT,
- "libbluetooth-for-tests": DEFAULT_NINJA_WEIGHT,
- "libbt_common": DEFAULT_NINJA_WEIGHT,
- "libbt_packets_nonapex": DEFAULT_NINJA_WEIGHT,
- "libbt_packets": DEFAULT_NINJA_WEIGHT,
- "libbt_shim_ffi": DEFAULT_NINJA_WEIGHT,
- "libbt_shim": DEFAULT_NINJA_WEIGHT,
- "libbt-audio-hal-interface": DEFAULT_NINJA_WEIGHT,
- "libbt-bta-core": DEFAULT_NINJA_WEIGHT,
- "libbt-bta": DEFAULT_NINJA_WEIGHT,
- "libbt-common": DEFAULT_NINJA_WEIGHT,
- "libbt-hci": DEFAULT_NINJA_WEIGHT,
- "libbt-platform-protos-lite": DEFAULT_NINJA_WEIGHT,
- "libbt-protos-lite": DEFAULT_NINJA_WEIGHT,
- "libbt-sbc-decoder": DEFAULT_NINJA_WEIGHT,
- "libc": DEFAULT_NINJA_WEIGHT,
- "libclap": DEFAULT_NINJA_WEIGHT,
- "libcodec2_soft_av1dec_gav1": DEFAULT_NINJA_WEIGHT,
- "libcompositionengine_test": DEFAULT_NINJA_WEIGHT,
- "libdevices": DEFAULT_NINJA_WEIGHT,
- "libfrontend_proto": DEFAULT_NINJA_WEIGHT,
- "libhwtrust": DEFAULT_NINJA_WEIGHT,
- "libjni": DEFAULT_NINJA_WEIGHT,
- "libkeystore2": DEFAULT_NINJA_WEIGHT,
- "libkmr_ta": DEFAULT_NINJA_WEIGHT,
- "liblmp": DEFAULT_NINJA_WEIGHT,
- "libopenjdkjvmtid": DEFAULT_NINJA_WEIGHT,
- "libprotobuf_deprecated": DEFAULT_NINJA_WEIGHT,
- "libprotobuf": DEFAULT_NINJA_WEIGHT,
- "libregex": DEFAULT_NINJA_WEIGHT,
- "LibStatsPullTests": DEFAULT_NINJA_WEIGHT,
- "libstd": DEFAULT_NINJA_WEIGHT,
- "libsurfaceflinger_unittest": DEFAULT_NINJA_WEIGHT,
- "libsyn": DEFAULT_NINJA_WEIGHT,
- "libtokio": DEFAULT_NINJA_WEIGHT,
- "libuwb_core": DEFAULT_NINJA_WEIGHT,
- "libuwb_uci_jni_rust": DEFAULT_NINJA_WEIGHT,
- "libuwb_uci_packets": DEFAULT_NINJA_WEIGHT,
- "libvpx": DEFAULT_NINJA_WEIGHT,
- "libvulkan_enc": DEFAULT_NINJA_WEIGHT,
- "libwebrtc": DEFAULT_NINJA_WEIGHT,
- "LiveWallpapersPicker": DEFAULT_NINJA_WEIGHT,
- "LockTaskApp": DEFAULT_NINJA_WEIGHT,
- "LongevityPlatformLibTests": DEFAULT_NINJA_WEIGHT,
- "ManagedProvisioning": DEFAULT_NINJA_WEIGHT,
- "ManagedProvisioningTests": DEFAULT_NINJA_WEIGHT,
- "MediaProvider": DEFAULT_NINJA_WEIGHT,
- "MediaProviderClientTests": DEFAULT_NINJA_WEIGHT,
- "MediaProviderLegacy": DEFAULT_NINJA_WEIGHT,
- "messaging": DEFAULT_NINJA_WEIGHT,
- "metalava": DEFAULT_NINJA_WEIGHT,
- "MicrobenchmarkRunnerTests": DEFAULT_NINJA_WEIGHT,
- "microdroid_manager": DEFAULT_NINJA_WEIGHT,
- "minikin_tests": DEFAULT_NINJA_WEIGHT,
- "MLCTestApp": DEFAULT_NINJA_WEIGHT,
- "MmsService": DEFAULT_NINJA_WEIGHT,
- "MmsServiceTests": DEFAULT_NINJA_WEIGHT,
- "module-lib-api-stubs-docs-non-updatable": DEFAULT_NINJA_WEIGHT,
- "motion_tool_lib_tests": DEFAULT_NINJA_WEIGHT,
- "MtpService": DEFAULT_NINJA_WEIGHT,
- "MultiUserTests": DEFAULT_NINJA_WEIGHT,
- "NearbyIntegrationUiTests": DEFAULT_NINJA_WEIGHT,
- "net_test_bluetooth": DEFAULT_NINJA_WEIGHT,
- "net_test_btif": DEFAULT_NINJA_WEIGHT,
- "net_test_main_shim": DEFAULT_NINJA_WEIGHT,
- "net_test_stack": DEFAULT_NINJA_WEIGHT,
- "net-tests-utils": DEFAULT_NINJA_WEIGHT,
- "NetworkStackCoverageTests": DEFAULT_NINJA_WEIGHT,
- "NetworkStackIntegrationTests": DEFAULT_NINJA_WEIGHT,
- "NetworkStackNext": DEFAULT_NINJA_WEIGHT,
- "NfcNci": DEFAULT_NINJA_WEIGHT,
- "NfcNciUnitTests": DEFAULT_NINJA_WEIGHT,
- "NotEmptyTestApp": DEFAULT_NINJA_WEIGHT,
- "NotificationFunctionalTests": DEFAULT_NINJA_WEIGHT,
- "oatdumpd": DEFAULT_NINJA_WEIGHT,
- "OsuLogin": DEFAULT_NINJA_WEIGHT,
- "PackageInstaller": DEFAULT_NINJA_WEIGHT,
- "PackageManagerComponentOverrideTests": DEFAULT_NINJA_WEIGHT,
- "PackageManagerPerfTests": DEFAULT_NINJA_WEIGHT,
- "PackageManagerServiceServerTests": DEFAULT_NINJA_WEIGHT,
- "PackageManagerServiceUnitTests": DEFAULT_NINJA_WEIGHT,
- "PackageWatchdogTest": DEFAULT_NINJA_WEIGHT,
- "PandoraServerLib": DEFAULT_NINJA_WEIGHT,
- "pdl": DEFAULT_NINJA_WEIGHT,
- "perfetto_trace_java_protos": DEFAULT_NINJA_WEIGHT,
- "perfetto_trace-full": DEFAULT_NINJA_WEIGHT,
- "PermissionController": DEFAULT_NINJA_WEIGHT,
- "PermissionControllerMockingTests": DEFAULT_NINJA_WEIGHT,
- "PixelAppCompTests": DEFAULT_NINJA_WEIGHT,
- "platform-bootclasspath": DEFAULT_NINJA_WEIGHT,
- "PlatformCommonScenarioTests": DEFAULT_NINJA_WEIGHT,
- "PlatformComposeCoreTests": DEFAULT_NINJA_WEIGHT,
- "platformprotoslite": DEFAULT_NINJA_WEIGHT,
- "PlatformRuleTests": DEFAULT_NINJA_WEIGHT,
- "precompiled_sepolicy-without_apex": DEFAULT_NINJA_WEIGHT,
- "PresencePolling": DEFAULT_NINJA_WEIGHT,
- "PrintSpooler": DEFAULT_NINJA_WEIGHT,
- "QuickSearchBox": DEFAULT_NINJA_WEIGHT,
- "RemoteDPCTestApp": DEFAULT_NINJA_WEIGHT,
- "RemoteProvisioningServiceTests": DEFAULT_NINJA_WEIGHT,
- "RkpdAppUnitTests": DEFAULT_NINJA_WEIGHT,
- "Robolectric_shadows_framework": DEFAULT_NINJA_WEIGHT,
- "RoleHolderApp": DEFAULT_NINJA_WEIGHT,
- "SdkSandbox": DEFAULT_NINJA_WEIGHT,
- "service-appsearch": DEFAULT_NINJA_WEIGHT,
- "service-connectivity": DEFAULT_NINJA_WEIGHT,
- "service-uwb": DEFAULT_NINJA_WEIGHT,
- "service-wifi": DEFAULT_NINJA_WEIGHT,
- "services-non-updatable-stubs": DEFAULT_NINJA_WEIGHT,
- "services": DEFAULT_NINJA_WEIGHT,
- "Settings-core": DEFAULT_NINJA_WEIGHT,
- "Settings": DEFAULT_NINJA_WEIGHT,
- "SettingsIntelligence": DEFAULT_NINJA_WEIGHT,
- "SettingsLibTests": DEFAULT_NINJA_WEIGHT,
- "SettingsProvider": DEFAULT_NINJA_WEIGHT,
- "Shell": DEFAULT_NINJA_WEIGHT,
- "SimAppDialog": DEFAULT_NINJA_WEIGHT,
- "sl4a": DEFAULT_NINJA_WEIGHT,
- "SmsApp": DEFAULT_NINJA_WEIGHT,
- "SoundPicker": DEFAULT_NINJA_WEIGHT,
- "StagedInstallTest": DEFAULT_NINJA_WEIGHT,
- "StatementService": DEFAULT_NINJA_WEIGHT,
- "StatsdFrameworkTestApp": DEFAULT_NINJA_WEIGHT,
- "StatsdFrameworkTestAppNoPermission": DEFAULT_NINJA_WEIGHT,
- "statsdprotolite": DEFAULT_NINJA_WEIGHT,
- "Stk": DEFAULT_NINJA_WEIGHT,
- "StorageManager": DEFAULT_NINJA_WEIGHT,
- "system-api-stubs-docs-non-updatable": DEFAULT_NINJA_WEIGHT,
- "SystemUI-core": DEFAULT_NINJA_WEIGHT,
- "SystemUI-tests-base": DEFAULT_NINJA_WEIGHT,
- "SystemUI-tests": DEFAULT_NINJA_WEIGHT,
- "SystemUI": DEFAULT_NINJA_WEIGHT,
- "SystemUIComposeFeatures": DEFAULT_NINJA_WEIGHT,
- "SystemUIComposeFeaturesTests": DEFAULT_NINJA_WEIGHT,
- "SystemUITests": DEFAULT_NINJA_WEIGHT,
- "Tag": DEFAULT_NINJA_WEIGHT,
- "Telecom": DEFAULT_NINJA_WEIGHT,
- "TelecomUnitTests": DEFAULT_NINJA_WEIGHT,
- "telephony-common": DEFAULT_NINJA_WEIGHT,
- "TelephonyProvider": DEFAULT_NINJA_WEIGHT,
- "TeleService": DEFAULT_NINJA_WEIGHT,
- "test-api-stubs-docs-non-updatable": DEFAULT_NINJA_WEIGHT,
- "TetheringIntegrationTests": DEFAULT_NINJA_WEIGHT,
- "TetheringNext": DEFAULT_NINJA_WEIGHT,
- "ThemePickerTests": DEFAULT_NINJA_WEIGHT,
- "Traceur": DEFAULT_NINJA_WEIGHT,
- "UsbManagerTests": DEFAULT_NINJA_WEIGHT,
- "UsbTests": DEFAULT_NINJA_WEIGHT,
- "virtmgr": DEFAULT_NINJA_WEIGHT,
- "WallpaperPicker2TestLib": DEFAULT_NINJA_WEIGHT,
- "WallpaperPicker2Tests": DEFAULT_NINJA_WEIGHT,
- "WifiDialog": DEFAULT_NINJA_WEIGHT,
- "wm-proto-parsers": DEFAULT_NINJA_WEIGHT,
- "WMShellFlickerTests": DEFAULT_NINJA_WEIGHT,
- "WmTests": DEFAULT_NINJA_WEIGHT,
- "wpa_supplicant": DEFAULT_NINJA_WEIGHT,
+ // The list of module types which are expected to spend lots of build time.
+ // With `--ninja_weight_source=soong`, ninja builds these module types and deps first.
+ HugeModuleTypePrefixMap = map[string]int{
+ "rust_": HIGH_PRIORITIZED_WEIGHT,
+ "droidstubs": DEFAULT_PRIORITIZED_WEIGHT,
+ "art_": DEFAULT_PRIORITIZED_WEIGHT,
+ "ndk_library": DEFAULT_PRIORITIZED_WEIGHT,
}
)
diff --git a/apex/apex.go b/apex/apex.go
index cf18ec3..af9afb1 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1828,6 +1828,7 @@
Certificate() java.Certificate
BaseModuleName() string
LintDepSets() java.LintDepSets
+ PrivAppAllowlist() android.OptionalPath
}
var _ androidApp = (*java.AndroidApp)(nil)
@@ -1848,7 +1849,7 @@
return buildId
}
-func apexFileForAndroidApp(ctx android.BaseModuleContext, aapp androidApp) apexFile {
+func apexFilesForAndroidApp(ctx android.BaseModuleContext, aapp androidApp) []apexFile {
appDir := "app"
if aapp.Privileged() {
appDir = "priv-app"
@@ -1870,7 +1871,15 @@
}); ok {
af.overriddenPackageName = app.OverriddenManifestPackageName()
}
- return af
+ apexFiles := []apexFile{af}
+
+ if allowlist := aapp.PrivAppAllowlist(); allowlist.Valid() {
+ dirInApex := filepath.Join("etc", "permissions")
+ privAppAllowlist := newApexFile(ctx, allowlist.Path(), aapp.BaseModuleName()+"privapp", dirInApex, etc, aapp)
+ apexFiles = append(apexFiles, privAppAllowlist)
+ }
+
+ return apexFiles
}
func apexFileForRuntimeResourceOverlay(ctx android.BaseModuleContext, rro java.RuntimeResourceOverlayModule) apexFile {
@@ -2315,12 +2324,12 @@
case androidAppTag:
switch ap := child.(type) {
case *java.AndroidApp:
- vctx.filesInfo = append(vctx.filesInfo, apexFileForAndroidApp(ctx, ap))
+ vctx.filesInfo = append(vctx.filesInfo, apexFilesForAndroidApp(ctx, ap)...)
return true // track transitive dependencies
case *java.AndroidAppImport:
- vctx.filesInfo = append(vctx.filesInfo, apexFileForAndroidApp(ctx, ap))
+ vctx.filesInfo = append(vctx.filesInfo, apexFilesForAndroidApp(ctx, ap)...)
case *java.AndroidTestHelperApp:
- vctx.filesInfo = append(vctx.filesInfo, apexFileForAndroidApp(ctx, ap))
+ vctx.filesInfo = append(vctx.filesInfo, apexFilesForAndroidApp(ctx, ap)...)
case *java.AndroidAppSet:
appDir := "app"
if ap.Privileged() {
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 3ba4d8d..4a4ee44 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -6045,6 +6045,8 @@
sdk_version: "current",
system_modules: "none",
privileged: true,
+ privapp_allowlist: "perms.xml",
+ package_name: "com.android.AppFooPriv",
stl: "none",
apex_available: [ "myapex" ],
}
@@ -6074,6 +6076,7 @@
ensureContains(t, copyCmds, "image.apex/app/AppFoo@TEST.BUILD_ID/AppFoo.apk")
ensureContains(t, copyCmds, "image.apex/priv-app/AppFooPriv@TEST.BUILD_ID/AppFooPriv.apk")
+ ensureContains(t, copyCmds, "image.apex/etc/permissions/privapp_allowlist_com.android.AppFooPriv.xml")
appZipRule := ctx.ModuleForTests("AppFoo", "android_common_apex10000").Description("zip jni libs")
// JNI libraries are uncompressed
diff --git a/cmd/soong_build/main.go b/cmd/soong_build/main.go
index f347b8f..96f65a4 100644
--- a/cmd/soong_build/main.go
+++ b/cmd/soong_build/main.go
@@ -30,6 +30,7 @@
"android/soong/shared"
"android/soong/ui/metrics/bp2build_metrics_proto"
+ "github.com/google/blueprint"
"github.com/google/blueprint/bootstrap"
"github.com/google/blueprint/deptools"
"github.com/google/blueprint/metrics"
@@ -256,18 +257,47 @@
}
func writeNinjaHint(ctx *android.Context) error {
- wantModules := make([]string, len(allowlists.HugeModulesMap))
- i := 0
- for k := range allowlists.HugeModulesMap {
- wantModules[i] = k
- i += 1
- }
- outputsMap := ctx.Context.GetOutputsFromModuleNames(wantModules)
- var outputBuilder strings.Builder
- for k, v := range allowlists.HugeModulesMap {
- for _, output := range outputsMap[k] {
- outputBuilder.WriteString(fmt.Sprintf("%s,%d\n", output, v))
+ ctx.BeginEvent("ninja_hint")
+ defer ctx.EndEvent("ninja_hint")
+ // The current predictor focuses on reducing false negatives.
+ // If there are too many false positives (e.g., most modules are marked as positive),
+ // real long-running jobs cannot run early.
+ // Therefore, the model should be adjusted in this case.
+ // The model should also be adjusted if there are critical false negatives.
+ predicate := func(j *blueprint.JsonModule) (prioritized bool, weight int) {
+ prioritized = false
+ weight = 0
+ for prefix, w := range allowlists.HugeModuleTypePrefixMap {
+ if strings.HasPrefix(j.Type, prefix) {
+ prioritized = true
+ weight = w
+ return
+ }
}
+ dep_count := len(j.Deps)
+ src_count := 0
+ for _, a := range j.Module["Actions"].([]blueprint.JSONAction) {
+ src_count += len(a.Inputs)
+ }
+ input_size := dep_count + src_count
+
+ // Current threshold is an arbitrary value which only consider recall rather than accuracy.
+ if input_size > allowlists.INPUT_SIZE_THRESHOLD {
+ prioritized = true
+ weight += ((input_size) / allowlists.INPUT_SIZE_THRESHOLD) * allowlists.DEFAULT_PRIORITIZED_WEIGHT
+
+ // To prevent some modules from having too large a priority value.
+ if weight > allowlists.HIGH_PRIORITIZED_WEIGHT {
+ weight = allowlists.HIGH_PRIORITIZED_WEIGHT
+ }
+ }
+ return
+ }
+
+ outputsMap := ctx.Context.GetWeightedOutputsFromPredicate(predicate)
+ var outputBuilder strings.Builder
+ for output, weight := range outputsMap {
+ outputBuilder.WriteString(fmt.Sprintf("%s,%d\n", output, weight))
}
weightListFile := filepath.Join(topDir, ctx.Config().OutDir(), ".ninja_weight_list")
diff --git a/java/app.go b/java/app.go
index 7bb8cdb..da9c6f3 100755
--- a/java/app.go
+++ b/java/app.go
@@ -33,8 +33,17 @@
func init() {
RegisterAppBuildComponents(android.InitRegistrationContext)
+ pctx.HostBinToolVariable("ModifyAllowlistCmd", "modify_permissions_allowlist")
}
+var (
+ modifyAllowlist = pctx.AndroidStaticRule("modifyAllowlist",
+ blueprint.RuleParams{
+ Command: "${ModifyAllowlistCmd} $in $packageName $out",
+ CommandDeps: []string{"${ModifyAllowlistCmd}"},
+ }, "packageName")
+)
+
func RegisterAppBuildComponents(ctx android.RegistrationContext) {
ctx.RegisterModuleType("android_app", AndroidAppFactory)
ctx.RegisterModuleType("android_test", AndroidTestFactory)
@@ -115,6 +124,9 @@
// Prefer using other specific properties if build behaviour must be changed; avoid using this
// flag for anything but neverallow rules (unless the behaviour change is invisible to owners).
Updatable *bool
+
+ // Specifies the file that contains the allowlist for this app.
+ Privapp_allowlist *string `android:"path"`
}
// android_app properties that can be overridden by override_android_app
@@ -179,6 +191,8 @@
android.ApexBundleDepsInfo
javaApiUsedByOutputFile android.ModuleOutPath
+
+ privAppAllowlist android.OptionalPath
}
func (a *AndroidApp) IsInstallable() bool {
@@ -205,6 +219,10 @@
return a.jniCoverageOutputs
}
+func (a *AndroidApp) PrivAppAllowlist() android.OptionalPath {
+ return a.privAppAllowlist
+}
+
var _ AndroidLibraryDependency = (*AndroidApp)(nil)
type Certificate struct {
@@ -269,6 +287,10 @@
ctx.AddDependency(ctx.Module(), certificateTag, cert)
}
+ if a.appProperties.Privapp_allowlist != nil && !Bool(a.appProperties.Privileged) {
+ ctx.PropertyErrorf("privapp_allowlist", "privileged must be set in order to use privapp_allowlist")
+ }
+
for _, cert := range a.appProperties.Additional_certificates {
cert = android.SrcIsModule(cert)
if cert != "" {
@@ -598,6 +620,27 @@
return a.installApkName
}
+func (a *AndroidApp) createPrivappAllowlist(ctx android.ModuleContext) *android.OutputPath {
+ if a.appProperties.Privapp_allowlist == nil {
+ return nil
+ }
+ if a.overridableAppProperties.Package_name == nil {
+ ctx.PropertyErrorf("privapp_allowlist", "package_name must be set to use privapp_allowlist")
+ }
+ packageName := *a.overridableAppProperties.Package_name
+ fileName := "privapp_allowlist_" + packageName + ".xml"
+ outPath := android.PathForModuleOut(ctx, fileName).OutputPath
+ ctx.Build(pctx, android.BuildParams{
+ Rule: modifyAllowlist,
+ Input: android.PathForModuleSrc(ctx, *a.appProperties.Privapp_allowlist),
+ Output: outPath,
+ Args: map[string]string{
+ "packageName": packageName,
+ },
+ })
+ return &outPath
+}
+
func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) {
var apkDeps android.Paths
@@ -733,18 +776,27 @@
BuildBundleModule(ctx, bundleFile, a.exportPackage, jniJarFile, dexJarFile)
a.bundleFile = bundleFile
+ allowlist := a.createPrivappAllowlist(ctx)
+ if allowlist != nil {
+ a.privAppAllowlist = android.OptionalPathForPath(allowlist)
+ }
+
apexInfo := ctx.Provider(android.ApexInfoProvider).(android.ApexInfo)
// Install the app package.
- if (Bool(a.Module.properties.Installable) || ctx.Host()) && apexInfo.IsForPlatform() &&
- !a.appProperties.PreventInstall {
-
+ shouldInstallAppPackage := (Bool(a.Module.properties.Installable) || ctx.Host()) && apexInfo.IsForPlatform() && !a.appProperties.PreventInstall
+ if shouldInstallAppPackage {
var extraInstalledPaths android.Paths
for _, extra := range a.extraOutputFiles {
installed := ctx.InstallFile(a.installDir, extra.Base(), extra)
extraInstalledPaths = append(extraInstalledPaths, installed)
}
ctx.InstallFile(a.installDir, a.outputFile.Base(), a.outputFile, extraInstalledPaths...)
+
+ if a.privAppAllowlist.Valid() {
+ installPath := android.PathForModuleInstall(ctx, "etc", "permissions")
+ ctx.InstallFile(installPath, a.privAppAllowlist.Path().Base(), a.privAppAllowlist.Path())
+ }
}
a.buildAppDependencyInfo(ctx)
diff --git a/java/app_import.go b/java/app_import.go
index bfd6767..52ae024 100644
--- a/java/app_import.go
+++ b/java/app_import.go
@@ -423,6 +423,10 @@
return a.provenanceMetaDataFile
}
+func (a *AndroidAppImport) PrivAppAllowlist() android.OptionalPath {
+ return android.OptionalPath{}
+}
+
var dpiVariantGroupType reflect.Type
var archVariantGroupType reflect.Type
var supportedDpis = []string{"ldpi", "mdpi", "hdpi", "xhdpi", "xxhdpi", "xxxhdpi"}
diff --git a/java/app_test.go b/java/app_test.go
index 7e97b0f..daff94c 100644
--- a/java/app_test.go
+++ b/java/app_test.go
@@ -3539,3 +3539,51 @@
android.AssertStringDoesContain(t, testCase.desc, manifestFixerArgs, "--targetSdkVersion "+testCase.targetSdkVersionExpected)
}
}
+
+func TestPrivappAllowlist(t *testing.T) {
+ testJavaError(t, "privileged must be set in order to use privapp_allowlist", `
+ android_app {
+ name: "foo",
+ srcs: ["a.java"],
+ privapp_allowlist: "perms.xml",
+ }
+ `)
+
+ result := PrepareForTestWithJavaDefaultModules.RunTestWithBp(
+ t,
+ `
+ android_app {
+ name: "foo",
+ srcs: ["a.java"],
+ privapp_allowlist: "perms.xml",
+ privileged: true,
+ package_name: "com.android.foo",
+ sdk_version: "current",
+ }
+ override_android_app {
+ name: "bar",
+ base: "foo",
+ package_name: "com.google.android.foo",
+ }
+ `,
+ )
+ app := result.ModuleForTests("foo", "android_common")
+ overrideApp := result.ModuleForTests("foo", "android_common_bar")
+
+ // verify that privapp allowlist is created
+ app.Output("out/soong/.intermediates/foo/android_common/privapp_allowlist_com.android.foo.xml")
+ overrideApp.Output("out/soong/.intermediates/foo/android_common_bar/privapp_allowlist_com.google.android.foo.xml")
+ expectedAllowlist := "perms.xml"
+ actualAllowlist := app.Rule("modifyAllowlist").Input.String()
+ if expectedAllowlist != actualAllowlist {
+ t.Errorf("expected allowlist to be %q; got %q", expectedAllowlist, actualAllowlist)
+ }
+ overrideActualAllowlist := overrideApp.Rule("modifyAllowlist").Input.String()
+ if expectedAllowlist != overrideActualAllowlist {
+ t.Errorf("expected override allowlist to be %q; got %q", expectedAllowlist, overrideActualAllowlist)
+ }
+
+ // verify that permissions are copied to device
+ app.Output("out/soong/target/product/test_device/system/etc/permissions/privapp_allowlist_com.android.foo.xml")
+ overrideApp.Output("out/soong/target/product/test_device/system/etc/permissions/privapp_allowlist_com.google.android.foo.xml")
+}
diff --git a/scripts/Android.bp b/scripts/Android.bp
index 9367ff0..97f6ab4 100644
--- a/scripts/Android.bp
+++ b/scripts/Android.bp
@@ -237,3 +237,20 @@
name: "jars-to-module-info-java",
src: "jars-to-module-info-java.sh",
}
+
+python_binary_host {
+ name: "modify_permissions_allowlist",
+ main: "modify_permissions_allowlist.py",
+ srcs: [
+ "modify_permissions_allowlist.py",
+ ],
+}
+
+python_test_host {
+ name: "modify_permissions_allowlist_test",
+ main: "modify_permissions_allowlist_test.py",
+ srcs: [
+ "modify_permissions_allowlist_test.py",
+ "modify_permissions_allowlist.py",
+ ],
+}
diff --git a/scripts/modify_permissions_allowlist.py b/scripts/modify_permissions_allowlist.py
new file mode 100755
index 0000000..38ec7ec
--- /dev/null
+++ b/scripts/modify_permissions_allowlist.py
@@ -0,0 +1,70 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2022 The Android Open Source Project
+#
+# 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.
+#
+"""A tool for modifying privileged permission allowlists."""
+
+from __future__ import print_function
+
+import argparse
+import sys
+from xml.dom import minidom
+
+
+class InvalidRootNodeException(Exception):
+ pass
+
+
+class InvalidNumberOfPrivappPermissionChildren(Exception):
+ pass
+
+
+def modify_allowlist(allowlist_dom, package_name):
+ if allowlist_dom.documentElement.tagName != 'permissions':
+ raise InvalidRootNodeException
+ nodes = allowlist_dom.getElementsByTagName('privapp-permissions')
+ if nodes.length != 1:
+ raise InvalidNumberOfPrivappPermissionChildren
+ privapp_permissions = nodes[0]
+ privapp_permissions.setAttribute('package', package_name)
+
+
+def parse_args():
+ """Parse commandline arguments."""
+
+ parser = argparse.ArgumentParser()
+ parser.add_argument('input', help='input allowlist template file')
+ parser.add_argument(
+ 'package_name', help='package name to use in the allowlist'
+ )
+ parser.add_argument('output', help='output allowlist file')
+
+ return parser.parse_args()
+
+
+def main():
+ try:
+ args = parse_args()
+ doc = minidom.parse(args.input)
+ modify_allowlist(doc, args.package_name)
+ with open(args.output, 'w') as output_file:
+ doc.writexml(output_file, encoding='utf-8')
+ except Exception as err:
+ print('error: ' + str(err), file=sys.stderr)
+ sys.exit(-1)
+
+
+if __name__ == '__main__':
+ main()
diff --git a/scripts/modify_permissions_allowlist_test.py b/scripts/modify_permissions_allowlist_test.py
new file mode 100755
index 0000000..ee8b12c
--- /dev/null
+++ b/scripts/modify_permissions_allowlist_test.py
@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2022 The Android Open Source Project
+#
+# 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.
+#
+"""Unit tests for modify_permissions_allowlist.py."""
+
+from __future__ import print_function
+
+import unittest
+
+from xml.dom import minidom
+
+from modify_permissions_allowlist import InvalidRootNodeException, InvalidNumberOfPrivappPermissionChildren, modify_allowlist
+
+
+class ModifyPermissionsAllowlistTest(unittest.TestCase):
+
+ def test_invalid_root(self):
+ xml_data = '<foo></foo>'
+ xml_dom = minidom.parseString(xml_data)
+ self.assertRaises(InvalidRootNodeException, modify_allowlist, xml_dom, 'x')
+
+ def test_no_packages(self):
+ xml_data = '<permissions></permissions>'
+ xml_dom = minidom.parseString(xml_data)
+ self.assertRaises(
+ InvalidNumberOfPrivappPermissionChildren, modify_allowlist, xml_dom, 'x'
+ )
+
+ def test_multiple_packages(self):
+ xml_data = (
+ '<permissions>'
+ ' <privapp-permissions package="foo.bar"></privapp-permissions>'
+ ' <privapp-permissions package="bar.baz"></privapp-permissions>'
+ '</permissions>'
+ )
+ xml_dom = minidom.parseString(xml_data)
+ self.assertRaises(
+ InvalidNumberOfPrivappPermissionChildren, modify_allowlist, xml_dom, 'x'
+ )
+
+ def test_modify_package_name(self):
+ xml_data = (
+ '<permissions>'
+ ' <privapp-permissions package="foo.bar">'
+ ' <permission name="myperm1"/>'
+ ' </privapp-permissions>'
+ '</permissions>'
+ )
+ xml_dom = minidom.parseString(xml_data)
+ modify_allowlist(xml_dom, 'bar.baz')
+ expected_data = (
+ '<?xml version="1.0" ?>'
+ '<permissions>'
+ ' <privapp-permissions package="bar.baz">'
+ ' <permission name="myperm1"/>'
+ ' </privapp-permissions>'
+ '</permissions>'
+ )
+ self.assertEqual(expected_data, xml_dom.toxml())
+
+
+if __name__ == '__main__':
+ unittest.main(verbosity=2)
diff --git a/sh/sh_binary.go b/sh/sh_binary.go
index c921ca6..d2eede6 100644
--- a/sh/sh_binary.go
+++ b/sh/sh_binary.go
@@ -474,16 +474,18 @@
}}
}
-func InitShBinaryModule(s *ShBinary) {
+func initShBinaryModule(s *ShBinary, useBazel bool) {
s.AddProperties(&s.properties)
- android.InitBazelModule(s)
+ if useBazel {
+ android.InitBazelModule(s)
+ }
}
// sh_binary is for a shell script or batch file to be installed as an
// executable binary to <partition>/bin.
func ShBinaryFactory() android.Module {
module := &ShBinary{}
- InitShBinaryModule(module)
+ initShBinaryModule(module, true)
android.InitAndroidArchModule(module, android.HostAndDeviceSupported, android.MultilibFirst)
return module
}
@@ -492,7 +494,7 @@
// to $(HOST_OUT)/bin.
func ShBinaryHostFactory() android.Module {
module := &ShBinary{}
- InitShBinaryModule(module)
+ initShBinaryModule(module, true)
android.InitAndroidArchModule(module, android.HostSupported, android.MultilibFirst)
return module
}
@@ -500,7 +502,7 @@
// sh_test defines a shell script based test module.
func ShTestFactory() android.Module {
module := &ShTest{}
- InitShBinaryModule(&module.ShBinary)
+ initShBinaryModule(&module.ShBinary, false)
module.AddProperties(&module.testProperties)
android.InitAndroidArchModule(module, android.HostAndDeviceSupported, android.MultilibFirst)
@@ -510,7 +512,7 @@
// sh_test_host defines a shell script based test module that runs on a host.
func ShTestHostFactory() android.Module {
module := &ShTest{}
- InitShBinaryModule(&module.ShBinary)
+ initShBinaryModule(&module.ShBinary, false)
module.AddProperties(&module.testProperties)
// Default sh_test_host to unit_tests = true
if module.testProperties.Test_options.Unit_test == nil {
diff --git a/ui/build/rbe.go b/ui/build/rbe.go
index 6479925..3b9d301 100644
--- a/ui/build/rbe.go
+++ b/ui/build/rbe.go
@@ -183,8 +183,6 @@
return
}
- ctx.Status.Status("Dumping rbe metrics...")
-
outputDir := config.rbeProxyLogsDir()
if outputDir == "" {
ctx.Fatal("RBE output dir variable not defined. Aborting metrics dumping.")