Retire kernel-tests from goldfish
this target does not have much value but
requires maintenance.
Bug: 154346346
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ibdc021aa1dcafc583364961158e216666027439e
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 3310b9c..364f4ed 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,4 +1,3 @@
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/kernel-tests/goldfish_kernel_tests_x86_64.mk \
$(LOCAL_DIR)/sdk_phone_x86_vendor.mk \
$(LOCAL_DIR)/fvp.mk
diff --git a/kernel-tests/advancedFeatures.ini b/kernel-tests/advancedFeatures.ini
deleted file mode 100644
index b26c18d..0000000
--- a/kernel-tests/advancedFeatures.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-GrallocSync = on
-LogcatPipe = on
-GLAsyncSwap = on
-GLESDynamicVersion = on
-GLDMA = on
-EncryptUserData = on
-IntelPerformanceMonitoringUnit = on
-Wifi = on
-HostComposition = on
-DynamicPartition = on
-GLDirectMem = on
-VulkanNullOptionalStrings = on
-VulkanIgnoredHandles = on
diff --git a/kernel-tests/config.ini b/kernel-tests/config.ini
deleted file mode 100644
index f58040f..0000000
--- a/kernel-tests/config.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-avd.ini.encoding=UTF-8
-disk.dataPartition.size=2G
-hw.ramSize=2048
-image.sysdir.1=x86/
diff --git a/kernel-tests/fstab.ranchu b/kernel-tests/fstab.ranchu
deleted file mode 100644
index 12988ab..0000000
--- a/kernel-tests/fstab.ranchu
+++ /dev/null
@@ -1,6 +0,0 @@
-# Android fstab file.
-#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-/dev/block/vdc /data ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check,quota,forceencrypt=/dev/block/vdd,reservedsize=128M
-/devices/*/block/vdf auto auto defaults voldmanaged=sdcard:auto,encryptable=userdata
diff --git a/kernel-tests/goldfish_kernel_tests_x86_64.mk b/kernel-tests/goldfish_kernel_tests_x86_64.mk
deleted file mode 100644
index 28aa2ad..0000000
--- a/kernel-tests/goldfish_kernel_tests_x86_64.mk
+++ /dev/null
@@ -1,162 +0,0 @@
-PRODUCT_NAME := goldfish_kernel_tests_x86_64
-PRODUCT_DEVICE := generic_x86_64
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := Kernel tests for goldfish kernel
-PRODUCT_FULL_TREBLE_OVERRIDE := true
-
-BUILD_EMULATOR := false
-
-TARGET_NO_BOOTLOADER := true
-TARGET_NO_KERNEL := true
-TARGET_CPU_ABI := x86_64
-TARGET_ARCH := x86_64
-TARGET_ARCH_VARIANT := x86_64
-TARGET_SUPPORTS_64_BIT_APPS := true
-TARGET_USERIMAGES_USE_EXT4 := true
-TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
-
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
-BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
-BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_FLASH_BLOCK_SIZE := 512
-BOARD_HAVE_BLUETOOTH := false
-
-SYSTEM_CORE_ROOTDIR := system/core/rootdir
-PREBUILTS := prebuilts
-GOLDFISH_DIR := device/generic/goldfish
-THIS_DIR := device/generic/goldfish/kernel-tests
-
-# android.hardware.
-PRODUCT_PACKAGES += \
- android.hardware.keymaster@4.0-service \
- android.hardware.keymaster@4.0-impl \
- android.hardware.drm@1.1-service.clearkey \
- android.hardware.graphics.allocator@2.0-service \
- android.hardware.graphics.allocator@2.0-impl \
-
-# android.hidl.
-PRODUCT_PACKAGES += \
- android.hidl.allocator@1.0-service \
- android.hidl.base-V1.0-java \
- android.hidl.manager-V1.0-java \
- android.hidl.memory@1.0-impl \
- android.hidl.memory@1.0-impl.vendor \
-
-# libXYZ
-PRODUCT_PACKAGES += \
- libc.bootstrap \
- libdl.bootstrap \
- libm.bootstrap \
- libc \
- libstdc++ \
- libm \
- libdl \
- libutils \
- libsysutils \
- libhardware \
- libhardware_legacy \
- linker \
- linker64 \
-
-# logs
-PRODUCT_PACKAGES += \
- liblog \
- logd \
- logcat \
- logwrapper \
-
-# debugger
-PRODUCT_PACKAGES += \
- debuggerd \
- debuggerd64 \
- dumpstate \
- dumpsys \
- crash_dump \
- adbd.com.android.adbd \
-
-PRODUCT_HOST_PACKAGES += \
- adb \
-
-# QEMU
-PRODUCT_PACKAGES += \
- qemu-props \
-
-# Device modules
-PRODUCT_PACKAGES += \
- android.system.suspend@1.0-service \
- ashmemd \
- libashmemd_client \
- servicemanager \
- hwservicemanager \
- vndservice \
- vndservicemanager \
- toolbox \
- toybox \
- vold \
- init_system \
- init_vendor \
- init.environ.rc \
- reboot \
- service \
- cmd \
- sh \
- su \
- e2fsck \
- gzip \
-
-PRODUCT_HOST_PACKAGES += \
- e2fsck \
- mke2fs \
- e2fsdroid \
- sload_f2fs \
- make_f2fs \
-
-# SELinux
-PRODUCT_PACKAGES += \
- sepolicy \
- selinux_policy_system \
- selinux_policy \
- file_contexts \
- seapp_contexts \
- property_contexts \
- mac_permissions.xml \
-
-PRODUCT_COPY_FILES += \
- $(SYSTEM_CORE_ROOTDIR)/init.usb.rc:system/etc/init/hw/init.usb.rc \
- $(SYSTEM_CORE_ROOTDIR)/init.usb.configfs.rc:system/etc/init/hw/init.usb.configfs.rc \
- $(SYSTEM_CORE_ROOTDIR)/etc/hosts:system/etc/hosts \
-
-PRODUCT_COPY_FILES += \
- $(PREBUILTS)/qemu-kernel/x86_64/4.14/kernel-qemu2:kernel-ranchu \
-
-PRODUCT_COPY_FILES += \
- $(GOLDFISH_DIR)/data/etc/encryptionkey.img:encryptionkey.img \
- $(GOLDFISH_DIR)/ueventd.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
-
-PRODUCT_COPY_FILES += \
- $(THIS_DIR)/init.ranchu-core.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-core.sh \
- $(THIS_DIR)/init.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.ranchu.rc \
- $(THIS_DIR)/fstab.ranchu:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu \
- $(THIS_DIR)/config.ini:config.ini \
- $(THIS_DIR)/advancedFeatures.ini:advancedFeatures.ini \
-
-# The set of packages we want to force 'speed' compilation on.
-PRODUCT_DEXPREOPT_SPEED_APPS := \
-
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
- ro.zygote=zygote32
-
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.carrier=unknown
-
-DEVICE_MANIFEST_FILE += $(THIS_DIR)/manifest.xml
-# VINTF stuff for system and vendor (no product / odm / system_ext / etc.)
-PRODUCT_PACKAGES += \
- system_compatibility_matrix.xml \
- system_manifest.xml \
- vendor_compatibility_matrix.xml \
- vendor_manifest.xml \
-
-# Disable VINTF checks.
-PRODUCT_ENFORCE_VINTF_MANIFEST_OVERRIDE := false
diff --git a/kernel-tests/init.ranchu-core.sh b/kernel-tests/init.ranchu-core.sh
deleted file mode 100755
index 62c64aa..0000000
--- a/kernel-tests/init.ranchu-core.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/vendor/bin/sh
-
-# take the wake lock
-allowsuspend=`getprop ro.kernel.qemu.allowsuspend`
-case "$allowsuspend" in
- "") echo "emulator_wake_lock" > /sys/power/wake_lock
- ;;
- 1) echo "emulator_wake_lock" > /sys/power/wake_unlock
- ;;
- *) echo "emulator_wake_lock" > /sys/power/wake_lock
- ;;
-esac
diff --git a/kernel-tests/init.ranchu.rc b/kernel-tests/init.ranchu.rc
deleted file mode 100644
index 12a9b14..0000000
--- a/kernel-tests/init.ranchu.rc
+++ /dev/null
@@ -1,41 +0,0 @@
-on fs
- mount_all /vendor/etc/fstab.ranchu
-
-on early-init
- mount debugfs debugfs /sys/kernel/debug mode=755
-
-on init
- symlink /dev/goldfish_pipe /dev/android_pipe
- symlink /dev/goldfish_pipe /dev/qemu_pipe
-
-on post-fs-data
- # nothing
-
-on zygote-start
- # nothing
-
-on boot
- start goldfish-logcat
-
-on property:vendor.qemu.timezone=*
- setprop persist.sys.timezone ${vendor.qemu.timezone}
-
-on property:dev.bootcomplete=1
- setprop vendor.qemu.dev.bootcomplete 1
-
-service qemu-props /vendor/bin/qemu-props
- class core
- user root
- group root
- oneshot
-
-service goldfish-logcat /system/bin/logcat -Q
- user logd
- group log
- oneshot
-
-service bugreport /system/bin/dumpstate -d -p -z
- class main
- disabled
- oneshot
- keycodes 114 115 116
diff --git a/kernel-tests/manifest.xml b/kernel-tests/manifest.xml
deleted file mode 100644
index 1612508..0000000
--- a/kernel-tests/manifest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<manifest version="1.0" type="device" target-level="3">
- <hal format="hidl">
- <name>android.hardware.keymaster</name>
- <transport>hwbinder</transport>
- <version>4.0</version>
- <interface>
- <name>IKeymasterDevice</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>android.hardware.drm</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>ICryptoFactory</name>
- <instance>default</instance>
- </interface>
- <interface>
- <name>IDrmFactory</name>
- <instance>default</instance>
- </interface>
- <fqname>@1.1::ICryptoFactory/clearkey</fqname>
- <fqname>@1.1::IDrmFactory/clearkey</fqname>
- <fqname>@1.1::ICryptoFactory/widevine</fqname>
- <fqname>@1.1::IDrmFactory/widevine</fqname>
- </hal>
-</manifest>
