Merge remote-tracking branch 'aosp/upstream-main' into HEAD

* aosp/upstream-main: (42 commits)
  Transition into 'exec' config on the `aapt2` attr of android_toolchain.
  Misc tool mapping fixes
  Init tests for android_local_test rule. Part of #106
  Always pass proguard implicit output artifacts to Native and symlink them.
  Add a dummy SDK for rules_android.
  Switch Cpp `BuildInfo` system to new API.
  Wire up AndroidOptimizationInfo in Starlark
  Wire up AndroidPreDexJarInfo in Starlark android_binary_internal.
  Use `binary_jar` as `java_resource_jar` if the flag `get_java_resources_from_optimized_jar` is True.
  Wire up ProguardMappingInfo in Starlark.
  Remove min_sdk_version from test in preparation for ACL fixes.
  Deal with explicit namespaces in Bazel
  Set most of the dependency_map tools to //tools/android:gen_fail
  Rename
  support-additional_providers-in-make_rule
  Replace _DEPOT_MIN_SDK_FLOOR constant with an acl-based system.
  Release src/tools/mi/deployment_oss
  Remove unused enforce_min_sdk_floor acl.
  Fix a bug that `proguard_specs` should be a list of Files rather than Targets in method `_dex.generate_main_dex_list`.
  Remove the redundant underscore in the runtype_suffix string.
  ...

Bug: 303786272
Change-Id: I5b22c7f5062340f6504a560b72da23cdec6af4df

1 files changed, 5 insertions, 7 deletions

diff --git a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/sdkdependenciesmanifest/AndroidManifestWriter.java b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/sdkdependenciesmanifest/AndroidManifestWriter.java
index f840c5f..67ce730 100644
--- a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/sdkdependenciesmanifest/AndroidManifestWriter.java
+++ b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/sdkdependenciesmanifest/AndroidManifestWriter.java
@@ -15,10 +15,8 @@
  */
 package com.google.devtools.build.android.sandboxedsdktoolbox.sdkdependenciesmanifest;
 
-import static com.google.devtools.build.android.sandboxedsdktoolbox.config.SdkModulesConfigUtils.getVersionMajor;
-
-import com.android.bundle.SdkModulesConfigOuterClass.SdkModulesConfig;
 import com.google.common.collect.ImmutableSet;
+import com.google.devtools.build.android.sandboxedsdktoolbox.info.SdkInfo;
 import java.io.BufferedOutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -50,7 +48,7 @@ final class AndroidManifestWriter {
   static void writeManifest(
       String packageName,
       String certificateDigest,
-      ImmutableSet<SdkModulesConfig> configs,
+      ImmutableSet<SdkInfo> infoSet,
       Path outputPath) {
     Document root = newEmptyDocument();
 
@@ -62,11 +60,11 @@ final class AndroidManifestWriter {
     Element applicationNode = root.createElement(APPLICATION_ELEMENT_NAME);
     manifestNode.appendChild(applicationNode);
 
-    for (SdkModulesConfig config : configs) {
+    for (SdkInfo sdkInfo : infoSet) {
       Element sdkDependencyElement = root.createElement(SDK_DEPENDENCY_ELEMENT_NAME);
-      sdkDependencyElement.setAttribute(ANDROID_NAME_ATTRIBUTE, config.getSdkPackageName());
+      sdkDependencyElement.setAttribute(ANDROID_NAME_ATTRIBUTE, sdkInfo.getPackageName());
       sdkDependencyElement.setAttribute(
-          ANDROID_VERSION_MAJOR_ATTRIBUTE, Long.toString(getVersionMajor(config)));
+          ANDROID_VERSION_MAJOR_ATTRIBUTE, Long.toString(sdkInfo.getVersionMajor()));
       sdkDependencyElement.setAttribute(ANDROID_CERTIFICATE_DIGEST_ATTRIBUTE, certificateDigest);
       applicationNode.appendChild(sdkDependencyElement);
     }