Merge "Snap for 11812660 from 21592eede99a6c0c446aff0f5e8dd7380a2adca2 to sdk-release" into sdk-releasesdk-release

3 files changed, 38 insertions, 9 deletions

diff --git a/build/Android.bp b/build/Android.bp
index 9c3d0e899..f54346ff1 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -214,6 +214,9 @@ android_sdk_repo_host {
         linux: {
             strip_files: ["lib64/*.so"],
         },
+        linux_bionic: {
+            enabled: false,
+        },
         darwin: {
             strip_files: ["lib64/*.dylib"],
         },
diff --git a/build/Android.mk b/build/Android.mk
index b873c59d3..b05bcd5ad 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -100,38 +100,46 @@ ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.
 ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.base.stubs_intermediates/classes.jar
 ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.runner.stubs_intermediates/classes.jar
 
-# ======= Lint API XML ===========
+# ======= Lint API XML (complete API) ===========
 full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api_versions_public_generated-api-versions.xml
 ALL_SDK_FILES += $(full_target)
 $(call dist-for-goals,sdk,$(full_target):data/api-versions.xml)
 
-# ======= Lint Annotations zip ===========
+# ======= Lint Annotations zip (complete API) ===========
 full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/sdk-annotations.zip
 $(eval $(call copy-one-file,$(call intermediates-dir-for,ETC,sdk-annotations.zip)/sdk-annotations.zip,$(full_target)))
 ALL_SDK_FILES += $(full_target)
 $(call dist-for-goals,sdk,$(full_target):data/annotations.zip)
 
-# ======= Lint system API XML ===========
+# ======= Lint system API XML (complete API) ===========
 full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api_versions_system_generated-api-versions.xml
 $(call dist-for-goals,sdk,$(full_target):system-data/api-versions.xml)
 
-# ======= Lint system Annotations zip ===========
+# ======= Lint system Annotations zip (complete API) ===========
 full_target := $(call intermediates-dir-for,ETC,sdk-annotations-system.zip)/sdk-annotations-system.zip
 $(call dist-for-goals,sdk,$(full_target):system-data/annotations.zip)
 
-# ======= Lint module-lib API XML ===========
+# ======= Lint module-lib API XML (non-updatable APIs only) ===========
 full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api_versions_module_lib_generated-api-versions.xml
 $(call dist-for-goals,sdk,$(full_target):module-lib-data/api-versions.xml)
 
-# ======= Lint module-lib Annotations zip ===========
+# ======= Lint module-lib API XML (complete API) ===========
+full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api_versions_module_lib_complete_generated-api-versions.xml
+$(call dist-for-goals,sdk,$(full_target):module-lib-data/api-versions-complete.xml)
+
+# ======= Lint module-lib Annotations zip (complete API) ===========
 full_target := $(call intermediates-dir-for,ETC,sdk-annotations-module-lib.zip)/sdk-annotations-module-lib.zip
 $(call dist-for-goals,sdk,$(full_target):module-lib-data/annotations.zip)
 
-# ======= Lint system-server API XML ===========
+# ======= Lint system-server API XML (non-updatable APIs only) ===========
 full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api_versions_system_server_generated-api-versions.xml
 $(call dist-for-goals,sdk,$(full_target):system-server-data/api-versions.xml)
 
-# ======= Lint system-server Annotations zip ===========
+# ======= Lint system-server API XML (complete API) ===========
+full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api_versions_system_server_complete_generated-api-versions.xml
+$(call dist-for-goals,sdk,$(full_target):system-server-data/api-versions-complete.xml)
+
+# ======= Lint system-server Annotations zip (complete API) ===========
 full_target := $(call intermediates-dir-for,ETC,sdk-annotations-system-server.zip)/sdk-annotations-system-server.zip
 $(call dist-for-goals,sdk,$(full_target):system-server-data/annotations.zip)
 
diff --git a/tools/cargo_embargo/src/main.rs b/tools/cargo_embargo/src/main.rs
index 9c67eba0e..2f9ea44c2 100644
--- a/tools/cargo_embargo/src/main.rs
+++ b/tools/cargo_embargo/src/main.rs
@@ -296,7 +296,9 @@ fn make_crates(args: &Args, cfg: &VariantConfig) -> Result<Vec<Crate>> {
         }
     } else {
         let cargo_output = generate_cargo_out(cfg).context("generate_cargo_out failed")?;
-        write(cargo_out_path, &cargo_output.cargo_out)?;
+        if cfg.run_cargo {
+            write(cargo_out_path, &cargo_output.cargo_out)?;
+        }
         write(cargo_metadata_path, &cargo_output.cargo_metadata)?;
         cargo_output
     };
@@ -477,9 +479,23 @@ fn generate_cargo_out(cfg: &VariantConfig) -> Result<CargoOutput> {
 
     let mut cargo_out = String::new();
     if cfg.run_cargo {
+        let envs = if cfg.extra_cfg.is_empty() {
+            vec![]
+        } else {
+            vec![(
+                "RUSTFLAGS",
+                cfg.extra_cfg
+                    .iter()
+                    .map(|cfg_flag| format!("--cfg {}", cfg_flag))
+                    .collect::<Vec<_>>()
+                    .join(" "),
+            )]
+        };
+
         // cargo build
         cargo_out += &run_cargo(
             Command::new("cargo")
+                .envs(envs.clone())
                 .args(["build", "--target", default_target])
                 .args(verbose_args)
                 .args(target_dir_args)
@@ -491,6 +507,7 @@ fn generate_cargo_out(cfg: &VariantConfig) -> Result<CargoOutput> {
             // cargo build --tests
             cargo_out += &run_cargo(
                 Command::new("cargo")
+                    .envs(envs.clone())
                     .args(["build", "--target", default_target, "--tests"])
                     .args(verbose_args)
                     .args(target_dir_args)
@@ -500,6 +517,7 @@ fn generate_cargo_out(cfg: &VariantConfig) -> Result<CargoOutput> {
             // cargo test -- --list
             cargo_out += &run_cargo(
                 Command::new("cargo")
+                    .envs(envs)
                     .args(["test", "--target", default_target])
                     .args(target_dir_args)
                     .args(&workspace_args)