Snap for 9098257 from 83ee95b35135ab6bee6dc3a4afed8ef82566bfbe to mainline-scheduling-releaseaml_sch_331113000aml_sch_331111000android13-mainline-scheduling-release

Change-Id: I8597d76ab66583e4fe0c4d2504a24d0d46f37027

2 files changed, 6 insertions, 23 deletions

diff --git a/apex/Android.bp b/apex/Android.bp
index 4588d237..05c40e4c 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -9,7 +9,8 @@ package {
 
 apex_defaults {
     name: "com.android.adbd-defaults",
-    defaults: ["r-launched-apex-module"],
+
+    defaults: ["r-launched-dcla-enabled-apex-module"],
 
     binaries: ["adbd"],
     compile_multilib: "both",
@@ -31,30 +32,10 @@ apex_defaults {
     compressible: true,
 }
 
-soong_config_module_type_import {
-    from: "system/apex/Android.bp",
-    module_types: ["library_linking_strategy_apex_defaults"],
-}
-
-library_linking_strategy_apex_defaults {
-    name: "adbd_manifest_defaults",
-    soong_config_variables: {
-        library_linking_strategy: {
-            prefer_static: {
-                min_sdk_version: "30",
-            },
-            conditions_default: {
-                min_sdk_version: "current",
-            },
-        },
-    },
-}
-
 apex {
     name: "com.android.adbd",
     defaults: [
         "com.android.adbd-defaults",
-        "adbd_manifest_defaults",
     ],
 }
 
diff --git a/apex/apex_manifest.json b/apex/apex_manifest.json
index 5339342f..75f40e0f 100644
--- a/apex/apex_manifest.json
+++ b/apex/apex_manifest.json
@@ -1,5 +1,7 @@
 {
   "name": "com.android.adbd",
-  "version": 339990000,
-  "versionName": "339990000"
+
+  // Placeholder module version to be replaced during build.
+  // Do not change!
+  "version": 0
 }