From 021bf3d9733d1c985402dfb6fa82c47a37459322 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 1 May 2024 16:59:00 -0700 Subject: Reapply "Make the enabled property configurable" Previously, I had changed some loadhook-appended property structs to use selects instead of the "target" property struct. This seems to not be exactly equivalent because "target" properties are merged with the regular properties later, at the time the arch mutator runs. With this reapplication, leave those target property structs alone to avoid breakages, but I'll have to look into what the issue is with them later. This reverts commit ed5276f0827915166e89b72bf26f7e65f68d2dd5. Ignore-AOSP-First: This cl needs to be in a topic with internal-only projects, will cherrypick to aosp after. Bug: 323382414 Test: m nothing --no-skip-soong-tests Change-Id: If355d24506e3f117d27b21442a6c02bca3402dc7 --- java/bootclasspath_fragment.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'java/bootclasspath_fragment.go') diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index cc3da7656..82a34ca9d 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -474,7 +474,7 @@ func (b *BootclasspathFragmentModule) GenerateAndroidBuildActions(ctx android.Mo // Only perform a consistency check if this module is the active module. That will prevent an // unused prebuilt that was created without instrumentation from breaking an instrumentation // build. - if isActiveModule(ctx.Module()) { + if isActiveModule(ctx, ctx.Module()) { b.bootclasspathFragmentPropertyCheck(ctx) } @@ -519,7 +519,7 @@ func (b *BootclasspathFragmentModule) GenerateAndroidBuildActions(ctx android.Mo // empty string if this module should not provide a boot image profile. func (b *BootclasspathFragmentModule) getProfileProviderApex(ctx android.BaseModuleContext) string { // Only use the profile from the module that is preferred. - if !isActiveModule(ctx.Module()) { + if !isActiveModule(ctx, ctx.Module()) { return "" } @@ -590,7 +590,7 @@ func (b *BootclasspathFragmentModule) configuredJars(ctx android.ModuleContext) // So ignore it even if it is not in PRODUCT_APEX_BOOT_JARS. // TODO(b/202896428): Add better way to handle this. _, unknown = android.RemoveFromList("android.car-module", unknown) - if isActiveModule(ctx.Module()) && len(unknown) > 0 { + if isActiveModule(ctx, ctx.Module()) && len(unknown) > 0 { ctx.ModuleErrorf("%s in contents must also be declared in PRODUCT_APEX_BOOT_JARS", unknown) } } -- cgit v1.2.3-59-g8ed1b