Rename the bool flag

Author: snazhmudinov

examples/bundle/features/assets/BUILD

@@ -16,6 +16,6 @@ android_feature_module(
     title = "asset_feature",
     library = ":lib",
     feature_name = "asset_feature",
-    has_dex = True,
+    has_code = True,
     visibility = ["//visibility:public"],
 )

providers/providers.bzl

@@ -105,7 +105,7 @@ AndroidFeatureModuleInfo = provider(
         binary = "String, target of the underlying split android_binary target",
         feature_name = "String, the name of the feature module. If unspecified, the target name will be used.",
         fused = "Boolean, whether the split is \"fused\" for the system image and for pre-L devices.",
-        has_dex = "Boolean, whether the split android_library contains dex code",
+        has_code = "Boolean, whether the feature module contains code",
         library = "String, target of the underlying split android_library target",
         manifest = "Optional AndroidManifest.xml file to use for this feature.",
         pre_dexed_jar = "File, contains pre-dexed jar file",

rules/android_application/android_application_rule.bzl

@@ -100,8 +100,8 @@ def _process_feature_module(
         _common.get_host_javabase(ctx),
     )
 
-    has_dex = bool(feature_target[AndroidFeatureModuleInfo].has_dex)
-    if has_dex:
+    has_code = bool(feature_target[AndroidFeatureModuleInfo].has_code)
+    if has_code:
         binary = feature_target[AndroidFeatureModuleInfo].binary[ApkInfo].unsigned_apk
     else:
         # Remove the dex files.
@@ -118,7 +118,7 @@ def _process_feature_module(
 
     # Create res .proto-apk_, output depending on whether further manipulations
     # are required after busybox. This prevents action conflicts.
-    if has_native_libs or is_asset_pack or has_dex:
+    if has_native_libs or is_asset_pack or has_code:
         res_apk = ctx.actions.declare_file(ctx.label.name + "/" + feature_target.label.name + "/res.proto-ap_")
     else:
         res_apk = out
@@ -158,7 +158,7 @@ def _process_feature_module(
         application_id = application_id,
     )
 
-    if not is_asset_pack and not has_native_libs and not has_dex:
+    if not is_asset_pack and not has_native_libs and not has_code:
         return
 
     if is_asset_pack:
@@ -177,8 +177,8 @@ def _process_feature_module(
             _common.filter_zip_include(ctx, binary, native_libs, ["lib/*"])
             inputs_to_merge.append(native_libs)
 
-        # Add dex files if has_dex is enabled
-        if has_dex:
+        # Add dex files if has_code is enabled
+        if has_code:
             if feature_dex:
                 # Use R8 feature splits dex output
                 inputs_to_merge.append(feature_dex)
@@ -220,7 +220,7 @@ def _create_feature_manifest(
         args.add(info.title_id)
         args.add(info.fused)
         args.add(aapt2.executable)
-        args.add(info.has_dex)
+        args.add(info.has_code)
 
         ctx.actions.run(
             executable = feature_manifest_script,
@@ -239,7 +239,7 @@ def _create_feature_manifest(
     # Rule has a manifest (already validated by android_feature_module).
     # Generate a priority manifest and then merge the user supplied manifest.
     is_asset_pack = feature_target[AndroidFeatureModuleInfo].is_asset_pack
-    has_dex = feature_target[AndroidFeatureModuleInfo].has_dex
+    has_code = feature_target[AndroidFeatureModuleInfo].has_code
     priority_manifest = ctx.actions.declare_file(
         ctx.label.name + "/" + feature_target.label.name + "/Priority_AndroidManifest.xml",
     )
@@ -251,7 +251,7 @@ def _create_feature_manifest(
     args.add(aapt2.executable)
     args.add(info.manifest)
     args.add(is_asset_pack)
-    args.add(has_dex)
+    args.add(has_code)
 
     ctx.actions.run(
         executable = priority_feature_manifest_script,
@@ -331,7 +331,7 @@ def _impl(ctx):
     all_proguard_specs = list(ctx.files.proguard_specs)
     for feature in ctx.attr.feature_modules:
         info = feature[AndroidFeatureModuleInfo]
-        if info.has_dex:
+        if info.has_code:
             feature_deploy_jars[info.feature_name] = info.pre_dexed_jar
         if info.proguards_specs:
             all_proguard_specs.extend(info.proguards_specs)

rules/android_application/android_feature_module_rule.bzl

@@ -35,8 +35,8 @@ load("@rules_java//java/common:proguard_spec_info.bzl", "ProguardSpecInfo")
 visibility(PROJECT_VISIBILITY)
 
 def _impl(ctx):
-    # Get the binary from the appropriate attribute based on has_dex
-    binary = ctx.attr.binary_with_dex if ctx.attr.has_dex else ctx.attr.binary
+    # Get the binary from the appropriate attribute based on has_code
+    binary = ctx.attr.binary_with_code if ctx.attr.has_code else ctx.attr.binary
     pre_dexed_jar = binary[AndroidPreDexJarInfo].pre_dex_jar
 
     # Collect proguard_specs from library dependencies of the feature module
@@ -80,7 +80,7 @@ def _impl(ctx):
     return [
         AndroidFeatureModuleInfo(
             binary = binary,
-            has_dex = ctx.attr.has_dex,
+            has_code = ctx.attr.has_code,
             library = utils.dedupe_split_attr(ctx.split_attr.library),
             title_id = ctx.attr.title_id,
             title_lib = ctx.attr.title_lib,
@@ -211,18 +211,18 @@ EOF
     }
     _android_binary(**binary_attrs)
 
-    has_dex = getattr(attrs, "has_dex", False)
+    has_code = getattr(attrs, "has_code", False)
     android_feature_module(
         name = attrs.name,
         library = attrs.library,
-        # Use binary_with_dex when has_dex=True to skip validation aspect
-        binary = None if has_dex else str(targets.binary),
-        binary_with_dex = str(targets.binary) if has_dex else None,
+        # Use binary_with_code when has_code=True to skip validation aspect
+        binary = None if has_code else str(targets.binary),
+        binary_with_code = str(targets.binary) if has_code else None,
         title_id = title_id,
         title_lib = str(targets.title_lib),
         feature_name = getattr(attrs, "feature_name", attrs.name),
         fused = getattr(attrs, "fused", True),
-        has_dex = has_dex,
+        has_code = has_code,
         manifest = getattr(attrs, "manifest", None),
         tags = tags,
         transitive_configs = transitive_configs,

rules/android_application/attrs.bzl

@@ -108,18 +108,18 @@ ANDROID_APPLICATION_ATTRS = _attrs.add(
 )
 
 ANDROID_FEATURE_MODULE_ATTRS = dict(
-    # binary is used when has_dex=False (with validation aspect)
+    # binary is used when has_code=False (with validation aspect)
     binary = attr.label(aspects = [android_feature_module_validation_aspect]),
-    # binary_with_dex is used when has_dex=True (without validation aspect)
-    binary_with_dex = attr.label(),
+    # binary_with_code is used when has_code=True (without validation aspect)
+    binary_with_code = attr.label(),
     feature_name = attr.string(),
     fused = attr.bool(
         default = True,
         doc = "Whether the split is fused for the system image and for pre-L devices.",
     ),
-    has_dex = attr.bool(
+    has_code = attr.bool(
         default = False,
-        doc = "Allows the library dependency to contain dex files (Kotlin/Java code).",
+        doc = "Whether the feature module contains code (Kotlin/Java). Maps to android:hasCode in manifest.",
     ),
     library = attr.label(
         allow_rules = ["android_library"],

rules/android_application/gen_android_feature_manifest.sh

@@ -20,7 +20,7 @@ split="${4}"
 title_id="${5}"
 fused="${6}"
 aapt="${7}"
-has_dex="${8}"
+has_code="${8}"
 
 aapt_cmd="$aapt dump xmltree $base_apk --file AndroidManifest.xml"
 version_code=$(${aapt_cmd} | grep "http://schemas.android.com/apk/res/android:versionCode" | cut -d "=" -f2 | head -n 1 )
@@ -30,8 +30,8 @@ then
   exit 1
 fi
 
-# Determine hasCode value based on has_dex parameter
-if [[ "$has_dex" == "true" ]]; then
+# Determine hasCode value based on has_code parameter
+if [[ "$has_code" == "true" ]]; then
   has_code_value="true"
 else
   has_code_value="false"

rules/android_application/gen_priority_android_feature_manifest.sh

@@ -20,7 +20,7 @@ split="${4}"
 aapt="${5}"
 in_manifest="${6}" # Developer-provided manifest for the feature module
 is_asset_pack="${7}"
-has_dex="${8}"
+has_code="${8}"
 
 aapt_cmd="$aapt dump xmltree $base_apk --file AndroidManifest.xml"
 version_code=$(${aapt_cmd} | grep "http://schemas.android.com/apk/res/android:versionCode" | cut -d "=" -f2 | head -n 1)
@@ -37,8 +37,8 @@ then
 	exit 1
 fi
 
-# Determine hasCode value based on has_dex parameter
-if [[ "$has_dex" == "true" ]]; then
+# Determine hasCode value based on has_code parameter
+if [[ "$has_code" == "true" ]]; then
   has_code_value="true"
 else
   has_code_value="false"