diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-04-23 23:38:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-23 23:38:46 +0000 |
| commit | 491926374778c9f02c8cf754d99b66cf1237f48c (patch) | |
| tree | 1a524307945b564e4a78f4419f7538b28911ae6e | |
| parent | 73aa21b4f49cdd39c7bcf44bec57db673026b4b6 (diff) | |
| parent | 7e85691e1e8840d3f9e98bc42e2d49a1e45e976f (diff) | |
| download | art-491926374778c9f02c8cf754d99b66cf1237f48c.tar.gz | |
Remove unused art-boot-image and support for prebuilt_boot_image am: 220d126f90 am: 287c9d229f am: 7e85691e1e
Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/art/+/1683864
Change-Id: I57aee90f077a99b99a33e21c1b5d2fa3f4f96b26
| -rw-r--r-- | SoongConfig.bp | 8 | ||||
| -rwxr-xr-x | current/sdk/Android.bp | 40 |
2 files changed, 0 insertions, 48 deletions
diff --git a/SoongConfig.bp b/SoongConfig.bp index 665fe200..66ab584b 100644 --- a/SoongConfig.bp +++ b/SoongConfig.bp @@ -81,14 +81,6 @@ soong_config_module_type { } soong_config_module_type { - name: "art_prebuilt_prebuilt_boot_image", - module_type: "prebuilt_boot_image", - config_namespace: "art_module", - bool_variables: ["source_build"], - properties: ["prefer"], -} - -soong_config_module_type { name: "art_prebuilt_prebuilt_bootclasspath_fragment", module_type: "prebuilt_bootclasspath_fragment", config_namespace: "art_module", diff --git a/current/sdk/Android.bp b/current/sdk/Android.bp index fbd004ce..0594a8c4 100755 --- a/current/sdk/Android.bp +++ b/current/sdk/Android.bp @@ -28,48 +28,9 @@ soong_config_module_type_import { "art_prebuilt_java_import", "art_prebuilt_java_sdk_library_import", "art_prebuilt_java_system_modules_import", - "art_prebuilt_prebuilt_boot_image", ], } -prebuilt_boot_image { - name: "art-module-sdk_art-boot-image@current", - sdk_member_name: "art-boot-image", - visibility: [ - "//art/build/apex", - "//art/build/boot", - "//art/build/sdk", - "//prebuilts:__subpackages__", - ], - apex_available: [ - "com.android.art", - "com.android.art.debug", - ], - image_name: "art", -} - -art_prebuilt_prebuilt_boot_image { - name: "art-boot-image", - // Do not prefer prebuilt if SOONG_CONFIG_art_module_source_build is true. - prefer: true, - soong_config_variables: { - source_build: { - prefer: false, - }, - }, - visibility: [ - "//art/build/apex", - "//art/build/boot", - "//art/build/sdk", - "//prebuilts:__subpackages__", - ], - apex_available: [ - "com.android.art", - "com.android.art.debug", - ], - image_name: "art", -} - java_import { name: "art-module-sdk_apache-xml@current", sdk_member_name: "apache-xml", @@ -2394,7 +2355,6 @@ sdk_snapshot { native_libs: ["art-module-sdk_libdexfile_support@current"], target: { android: { - boot_images: ["art-module-sdk_art-boot-image@current"], java_boot_libs: [ "art-module-sdk_apache-xml@current", "art-module-sdk_bouncycastle@current", |