diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-01 20:57:35 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-01 20:57:35 +0000 |
| commit | 014ddffda034e8667c03d0237d91f150da0fd1b7 (patch) | |
| tree | bda1abd96f481b24fc11a8e0a5772738440f84ab | |
| parent | fb8aa99a16a3cca4a1a8c6dc1fc055f1398399b3 (diff) | |
| parent | 83ee95b35135ab6bee6dc3a4afed8ef82566bfbe (diff) | |
| download | adb-android13-mainline-os-statsd-release.tar.gz | |
Snap for 8892598 from 83ee95b35135ab6bee6dc3a4afed8ef82566bfbe to mainline-os-statsd-releaseaml_sta_331910000aml_sta_331811000aml_sta_331711010aml_sta_331610000aml_sta_331511000aml_sta_331410000aml_sta_331311000aml_sta_331010010android13-mainline-os-statsd-release
Change-Id: If9be9e3ca46e7e1081013c4f44d52a62f3e7ed9d
| -rw-r--r-- | apex/Android.bp | 23 | ||||
| -rw-r--r-- | apex/apex_manifest.json | 6 |
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 } |