diff options
author | Anton Hansson <hansson@google.com> | 2022-04-25 11:30:02 +0100 |
---|---|---|
committer | Anton Hansson <hansson@google.com> | 2022-05-25 13:16:10 +0000 |
commit | c92fe23901358c4c0c94b911f97aa05c92c9c6ed (patch) | |
tree | c584566043ca0164a0ed55237a3098d03e994bcd | |
parent | dd5a6d5c953a753a6046b8f2a51d7c97d918a921 (diff) | |
download | development-c92fe23901358c4c0c94b911f97aa05c92c9c6ed.tar.gz |
Remove system-images files from the SDK
The system images distributed externally are created by a separate
set of rules than these. There are no known consumers of these
legacy system-image files.
This makes the SDK zip architecture-agnostic.
Bug: 205008975
Test: m sdk sdk_repo dist
Test: diff sdk zips from sdk_phone_arm64 and sdk_phone_x86 (no diff)
Merged-In: I7ba2eb244a5930721c82895cd2947a1d2aff63e2
Change-Id: I7ba2eb244a5930721c82895cd2947a1d2aff63e2
-rw-r--r-- | build/sdk-android-arm64-v8a.atree | 24 | ||||
-rw-r--r-- | build/sdk-android-armeabi-v7a.atree | 27 | ||||
-rw-r--r-- | build/sdk-android-armeabi.atree | 24 | ||||
-rw-r--r-- | build/sdk-android-x86.atree | 24 | ||||
-rw-r--r-- | build/sdk-android-x86_64.atree | 24 | ||||
-rw-r--r-- | build/sdk.atree | 16 |
6 files changed, 0 insertions, 139 deletions
diff --git a/build/sdk-android-arm64-v8a.atree b/build/sdk-android-arm64-v8a.atree deleted file mode 100644 index feaca42f6..000000000 --- a/build/sdk-android-arm64-v8a.atree +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (C) 2014 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -kernel/prebuilts/5.10/arm64/kernel-5.10-gz system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu -device/generic/goldfish/data/etc/encryptionkey.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/encryptionkey.img - -# version files for the SDK updater, from development.git -${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_arm64-v8a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties - -# feature control config file -device/generic/goldfish/data/etc/advancedFeatures.ini.arm system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini diff --git a/build/sdk-android-armeabi-v7a.atree b/build/sdk-android-armeabi-v7a.atree deleted file mode 100644 index 2e20dcd9e..000000000 --- a/build/sdk-android-armeabi-v7a.atree +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (C) 2011 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Copy the ARMv7 specific kernel image to .../kernel-qemu -prebuilts/qemu-kernel/arm64/4.4/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64 - -# version files for the SDK updater, from development.git -${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi-v7a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties - -# custom hardware.ini for 32 bit images -development/sys-img/images_armeabi-v7a_hardware.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/hardware.ini - -# feature control config file -device/generic/goldfish/data/etc/advancedFeatures.ini.arm system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini diff --git a/build/sdk-android-armeabi.atree b/build/sdk-android-armeabi.atree deleted file mode 100644 index 8ea6e7e6b..000000000 --- a/build/sdk-android-armeabi.atree +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (C) 2011 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu -prebuilts/qemu-kernel/arm64/4.4/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64 - -# version files for the SDK updater, from development.git -${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties - -# feature control config file -device/generic/goldfish/data/etc/advancedFeatures.ini.arm system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini diff --git a/build/sdk-android-x86.atree b/build/sdk-android-x86.atree deleted file mode 100644 index 02b82fec1..000000000 --- a/build/sdk-android-x86.atree +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (C) 2011 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -kernel/prebuilts/5.10/x86_64/kernel-5.10 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64 -device/generic/goldfish/data/etc/encryptionkey.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/encryptionkey.img - -# version files for the SDK updater, from development.git -${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_${TARGET_ARCH}_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties - -# feature control config file -device/generic/goldfish/data/etc/advancedFeatures.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini diff --git a/build/sdk-android-x86_64.atree b/build/sdk-android-x86_64.atree deleted file mode 100644 index 7672c0079..000000000 --- a/build/sdk-android-x86_64.atree +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (C) 2014 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -kernel/prebuilts/5.10/x86_64/kernel-5.10 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu -device/generic/goldfish/data/etc/encryptionkey.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/encryptionkey.img - -# version files for the SDK updater, from development.git -${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_${TARGET_ARCH}_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties - -# feature control config file -device/generic/goldfish/data/etc/advancedFeatures.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini diff --git a/build/sdk.atree b/build/sdk.atree index cc160f22b..b23b76751 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -113,22 +113,6 @@ development/sdk/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/skins/NOTIC ############################################################################## -# System image Component -############################################################################## - -# System images + Kernel -system-qemu.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/system.img -vendor-qemu.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/vendor.img -ramdisk-qemu.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/ramdisk.img -device/generic/goldfish/data/etc/userdata.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/userdata.img -data/misc system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/data/misc -system/build.prop system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/build.prop -VerifiedBootParams.textproto system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/VerifiedBootParams.textproto - -# Note: the kernel image is handled by sdk-android-<abi>.atree now. - - -############################################################################## # Docs Component ############################################################################## |