Revert "RESTRICT AUTOMERGE Updating the platform sdk version for Q"
This reverts commit 5e0226b816c2d182b5dcf24ac65a8fbd550c81de.
Reason for revert: QT SDK Finalization. Will be merged again on/after May 13th
Bug: 129975435
Change-Id: Ia3693b2a4907c4ca9be56cfe18fda35b8545abba
diff --git a/core/config.mk b/core/config.mk
index 42e57a9..f318e1d 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -781,7 +781,7 @@
# is made which breaks compatibility with the previous platform sepolicy version,
# not just on every increase in PLATFORM_SDK_VERSION. The minor version should
# be reset to 0 on every bump of the PLATFORM_SDK_VERSION.
-sepolicy_major_vers := 29
+sepolicy_major_vers := 28
sepolicy_minor_vers := 0
ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 8b43a7d..70fc57a 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -121,7 +121,7 @@
# When you increment the PLATFORM_SDK_VERSION please ensure you also
# clear out the following text file of all older PLATFORM_VERSION's:
# cts/tests/tests/os/assets/platform_versions.txt
- PLATFORM_SDK_VERSION := 29
+ PLATFORM_SDK_VERSION := 28
endif
.KATI_READONLY := PLATFORM_SDK_VERSION
diff --git a/target/product/gsi/29.txt b/target/product/gsi/29.txt
deleted file mode 100644
index 7693d82..0000000
--- a/target/product/gsi/29.txt
+++ /dev/null
@@ -1,281 +0,0 @@
-LLNDK: libEGL.so
-LLNDK: libGLESv1_CM.so
-LLNDK: libGLESv2.so
-LLNDK: libGLESv3.so
-LLNDK: libRS.so
-LLNDK: libandroid_net.so
-LLNDK: libc.so
-LLNDK: libcgrouprc.so
-LLNDK: libdl.so
-LLNDK: libft2.so
-LLNDK: liblog.so
-LLNDK: libm.so
-LLNDK: libmediandk.so
-LLNDK: libnativewindow.so
-LLNDK: libneuralnetworks.so
-LLNDK: libsync.so
-LLNDK: libvndksupport.so
-LLNDK: libvulkan.so
-VNDK-SP: android.hardware.graphics.common@1.0.so
-VNDK-SP: android.hardware.graphics.common@1.1.so
-VNDK-SP: android.hardware.graphics.common@1.2.so
-VNDK-SP: android.hardware.graphics.mapper@2.0.so
-VNDK-SP: android.hardware.graphics.mapper@2.1.so
-VNDK-SP: android.hardware.graphics.mapper@3.0.so
-VNDK-SP: android.hardware.renderscript@1.0.so
-VNDK-SP: android.hidl.memory.token@1.0.so
-VNDK-SP: android.hidl.memory@1.0.so
-VNDK-SP: android.hidl.memory@1.0-impl.so
-VNDK-SP: android.hidl.safe_union@1.0.so
-VNDK-SP: libRSCpuRef.so
-VNDK-SP: libRSDriver.so
-VNDK-SP: libRS_internal.so
-VNDK-SP: libbacktrace.so
-VNDK-SP: libbase.so
-VNDK-SP: libbcinfo.so
-VNDK-SP: libbinderthreadstate.so
-VNDK-SP: libblas.so
-VNDK-SP: libc++.so
-VNDK-SP: libcompiler_rt.so
-VNDK-SP: libcutils.so
-VNDK-SP: libhardware.so
-VNDK-SP: libhidlbase.so
-VNDK-SP: libhidlmemory.so
-VNDK-SP: libhidltransport.so
-VNDK-SP: libhwbinder.so
-VNDK-SP: libhwbinder_noltopgo.so
-VNDK-SP: libion.so
-VNDK-SP: libjsoncpp.so
-VNDK-SP: liblzma.so
-VNDK-SP: libprocessgroup.so
-VNDK-SP: libunwindstack.so
-VNDK-SP: libutils.so
-VNDK-SP: libutilscallstack.so
-VNDK-SP: libz.so
-VNDK-core: android.frameworks.cameraservice.common@2.0.so
-VNDK-core: android.frameworks.cameraservice.device@2.0.so
-VNDK-core: android.frameworks.cameraservice.service@2.0.so
-VNDK-core: android.frameworks.displayservice@1.0.so
-VNDK-core: android.frameworks.schedulerservice@1.0.so
-VNDK-core: android.frameworks.sensorservice@1.0.so
-VNDK-core: android.frameworks.stats@1.0.so
-VNDK-core: android.frameworks.vr.composer@1.0.so
-VNDK-core: android.hardware.atrace@1.0.so
-VNDK-core: android.hardware.audio.common@2.0.so
-VNDK-core: android.hardware.audio.common@4.0.so
-VNDK-core: android.hardware.audio.common@5.0.so
-VNDK-core: android.hardware.audio.effect@2.0.so
-VNDK-core: android.hardware.audio.effect@4.0.so
-VNDK-core: android.hardware.audio.effect@5.0.so
-VNDK-core: android.hardware.audio@2.0.so
-VNDK-core: android.hardware.audio@4.0.so
-VNDK-core: android.hardware.audio@5.0.so
-VNDK-core: android.hardware.authsecret@1.0.so
-VNDK-core: android.hardware.automotive.audiocontrol@1.0.so
-VNDK-core: android.hardware.automotive.evs@1.0.so
-VNDK-core: android.hardware.automotive.vehicle@2.0.so
-VNDK-core: android.hardware.biometrics.face@1.0.so
-VNDK-core: android.hardware.biometrics.fingerprint@2.1.so
-VNDK-core: android.hardware.bluetooth.a2dp@1.0.so
-VNDK-core: android.hardware.bluetooth.audio@2.0.so
-VNDK-core: android.hardware.bluetooth@1.0.so
-VNDK-core: android.hardware.boot@1.0.so
-VNDK-core: android.hardware.broadcastradio@1.0.so
-VNDK-core: android.hardware.broadcastradio@1.1.so
-VNDK-core: android.hardware.broadcastradio@2.0.so
-VNDK-core: android.hardware.camera.common@1.0.so
-VNDK-core: android.hardware.camera.device@1.0.so
-VNDK-core: android.hardware.camera.device@3.2.so
-VNDK-core: android.hardware.camera.device@3.3.so
-VNDK-core: android.hardware.camera.device@3.4.so
-VNDK-core: android.hardware.camera.device@3.5.so
-VNDK-core: android.hardware.camera.metadata@3.2.so
-VNDK-core: android.hardware.camera.metadata@3.3.so
-VNDK-core: android.hardware.camera.metadata@3.4.so
-VNDK-core: android.hardware.camera.provider@2.4.so
-VNDK-core: android.hardware.camera.provider@2.5.so
-VNDK-core: android.hardware.cas.native@1.0.so
-VNDK-core: android.hardware.cas@1.0.so
-VNDK-core: android.hardware.cas@1.1.so
-VNDK-core: android.hardware.configstore-utils.so
-VNDK-core: android.hardware.configstore@1.0.so
-VNDK-core: android.hardware.configstore@1.1.so
-VNDK-core: android.hardware.confirmationui-support-lib.so
-VNDK-core: android.hardware.confirmationui@1.0.so
-VNDK-core: android.hardware.contexthub@1.0.so
-VNDK-core: android.hardware.drm@1.0.so
-VNDK-core: android.hardware.drm@1.1.so
-VNDK-core: android.hardware.drm@1.2.so
-VNDK-core: android.hardware.dumpstate@1.0.so
-VNDK-core: android.hardware.fastboot@1.0.so
-VNDK-core: android.hardware.gatekeeper@1.0.so
-VNDK-core: android.hardware.gnss.measurement_corrections@1.0.so
-VNDK-core: android.hardware.gnss.visibility_control@1.0.so
-VNDK-core: android.hardware.gnss@1.0.so
-VNDK-core: android.hardware.gnss@1.1.so
-VNDK-core: android.hardware.gnss@2.0.so
-VNDK-core: android.hardware.graphics.allocator@2.0.so
-VNDK-core: android.hardware.graphics.allocator@3.0.so
-VNDK-core: android.hardware.graphics.bufferqueue@1.0.so
-VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
-VNDK-core: android.hardware.graphics.composer@2.1.so
-VNDK-core: android.hardware.graphics.composer@2.2.so
-VNDK-core: android.hardware.graphics.composer@2.3.so
-VNDK-core: android.hardware.health.storage@1.0.so
-VNDK-core: android.hardware.health@1.0.so
-VNDK-core: android.hardware.health@2.0.so
-VNDK-core: android.hardware.input.classifier@1.0.so
-VNDK-core: android.hardware.input.common@1.0.so
-VNDK-core: android.hardware.ir@1.0.so
-VNDK-core: android.hardware.keymaster@3.0.so
-VNDK-core: android.hardware.keymaster@4.0.so
-VNDK-core: android.hardware.light@2.0.so
-VNDK-core: android.hardware.media.bufferpool@1.0.so
-VNDK-core: android.hardware.media.bufferpool@2.0.so
-VNDK-core: android.hardware.media.c2@1.0.so
-VNDK-core: android.hardware.media.omx@1.0.so
-VNDK-core: android.hardware.media@1.0.so
-VNDK-core: android.hardware.memtrack@1.0.so
-VNDK-core: android.hardware.neuralnetworks@1.0.so
-VNDK-core: android.hardware.neuralnetworks@1.1.so
-VNDK-core: android.hardware.neuralnetworks@1.2.so
-VNDK-core: android.hardware.nfc@1.0.so
-VNDK-core: android.hardware.nfc@1.1.so
-VNDK-core: android.hardware.nfc@1.2.so
-VNDK-core: android.hardware.oemlock@1.0.so
-VNDK-core: android.hardware.power.stats@1.0.so
-VNDK-core: android.hardware.power@1.0.so
-VNDK-core: android.hardware.power@1.1.so
-VNDK-core: android.hardware.power@1.2.so
-VNDK-core: android.hardware.power@1.3.so
-VNDK-core: android.hardware.radio.config@1.0.so
-VNDK-core: android.hardware.radio.config@1.1.so
-VNDK-core: android.hardware.radio.config@1.2.so
-VNDK-core: android.hardware.radio.deprecated@1.0.so
-VNDK-core: android.hardware.radio@1.0.so
-VNDK-core: android.hardware.radio@1.1.so
-VNDK-core: android.hardware.radio@1.2.so
-VNDK-core: android.hardware.radio@1.3.so
-VNDK-core: android.hardware.radio@1.4.so
-VNDK-core: android.hardware.secure_element@1.0.so
-VNDK-core: android.hardware.secure_element@1.1.so
-VNDK-core: android.hardware.sensors@1.0.so
-VNDK-core: android.hardware.sensors@2.0.so
-VNDK-core: android.hardware.soundtrigger@2.0.so
-VNDK-core: android.hardware.soundtrigger@2.0-core.so
-VNDK-core: android.hardware.soundtrigger@2.1.so
-VNDK-core: android.hardware.soundtrigger@2.2.so
-VNDK-core: android.hardware.tetheroffload.config@1.0.so
-VNDK-core: android.hardware.tetheroffload.control@1.0.so
-VNDK-core: android.hardware.thermal@1.0.so
-VNDK-core: android.hardware.thermal@1.1.so
-VNDK-core: android.hardware.thermal@2.0.so
-VNDK-core: android.hardware.tv.cec@1.0.so
-VNDK-core: android.hardware.tv.cec@2.0.so
-VNDK-core: android.hardware.tv.input@1.0.so
-VNDK-core: android.hardware.usb.gadget@1.0.so
-VNDK-core: android.hardware.usb@1.0.so
-VNDK-core: android.hardware.usb@1.1.so
-VNDK-core: android.hardware.usb@1.2.so
-VNDK-core: android.hardware.vibrator@1.0.so
-VNDK-core: android.hardware.vibrator@1.1.so
-VNDK-core: android.hardware.vibrator@1.2.so
-VNDK-core: android.hardware.vibrator@1.3.so
-VNDK-core: android.hardware.vr@1.0.so
-VNDK-core: android.hardware.weaver@1.0.so
-VNDK-core: android.hardware.wifi.hostapd@1.0.so
-VNDK-core: android.hardware.wifi.hostapd@1.1.so
-VNDK-core: android.hardware.wifi.offload@1.0.so
-VNDK-core: android.hardware.wifi.supplicant@1.0.so
-VNDK-core: android.hardware.wifi.supplicant@1.1.so
-VNDK-core: android.hardware.wifi.supplicant@1.2.so
-VNDK-core: android.hardware.wifi@1.0.so
-VNDK-core: android.hardware.wifi@1.1.so
-VNDK-core: android.hardware.wifi@1.2.so
-VNDK-core: android.hardware.wifi@1.3.so
-VNDK-core: android.hidl.allocator@1.0.so
-VNDK-core: android.hidl.memory.block@1.0.so
-VNDK-core: android.hidl.token@1.0.so
-VNDK-core: android.hidl.token@1.0-utils.so
-VNDK-core: android.system.net.netd@1.0.so
-VNDK-core: android.system.net.netd@1.1.so
-VNDK-core: android.system.suspend@1.0.so
-VNDK-core: android.system.wifi.keystore@1.0.so
-VNDK-core: libadf.so
-VNDK-core: libaudioroute.so
-VNDK-core: libaudioutils.so
-VNDK-core: libbinder.so
-VNDK-core: libcamera_metadata.so
-VNDK-core: libcap.so
-VNDK-core: libcn-cbor.so
-VNDK-core: libcodec2.so
-VNDK-core: libcodec2_hidl@1.0.so
-VNDK-core: libcodec2_vndk.so
-VNDK-core: libcrypto.so
-VNDK-core: libcrypto_utils.so
-VNDK-core: libcurl.so
-VNDK-core: libdiskconfig.so
-VNDK-core: libdumpstateutil.so
-VNDK-core: libevent.so
-VNDK-core: libexif.so
-VNDK-core: libexpat.so
-VNDK-core: libfmq.so
-VNDK-core: libgatekeeper.so
-VNDK-core: libgui.so
-VNDK-core: libhardware_legacy.so
-VNDK-core: libhidlallocatorutils.so
-VNDK-core: libhidlcache.so
-VNDK-core: libjpeg.so
-VNDK-core: libkeymaster_messages.so
-VNDK-core: libkeymaster_portable.so
-VNDK-core: libldacBT_abr.so
-VNDK-core: libldacBT_enc.so
-VNDK-core: liblz4.so
-VNDK-core: libmedia_helper.so
-VNDK-core: libmedia_omx.so
-VNDK-core: libmemtrack.so
-VNDK-core: libminijail.so
-VNDK-core: libmkbootimg_abi_check.so
-VNDK-core: libnetutils.so
-VNDK-core: libnl.so
-VNDK-core: libopus.so
-VNDK-core: libpcre2.so
-VNDK-core: libpiex.so
-VNDK-core: libpng.so
-VNDK-core: libpower.so
-VNDK-core: libprocinfo.so
-VNDK-core: libprotobuf-cpp-full.so
-VNDK-core: libprotobuf-cpp-lite.so
-VNDK-core: libpuresoftkeymasterdevice.so
-VNDK-core: libradio_metadata.so
-VNDK-core: libselinux.so
-VNDK-core: libsoftkeymasterdevice.so
-VNDK-core: libspeexresampler.so
-VNDK-core: libsqlite.so
-VNDK-core: libssl.so
-VNDK-core: libstagefright_amrnb_common.so
-VNDK-core: libstagefright_bufferpool@2.0.so
-VNDK-core: libstagefright_bufferqueue_helper.so
-VNDK-core: libstagefright_enc_common.so
-VNDK-core: libstagefright_flacdec.so
-VNDK-core: libstagefright_foundation.so
-VNDK-core: libstagefright_omx.so
-VNDK-core: libstagefright_omx_utils.so
-VNDK-core: libstagefright_softomx.so
-VNDK-core: libstagefright_xmlparser.so
-VNDK-core: libsysutils.so
-VNDK-core: libtinyalsa.so
-VNDK-core: libtinyxml2.so
-VNDK-core: libui.so
-VNDK-core: libusbhost.so
-VNDK-core: libvorbisidec.so
-VNDK-core: libwifi-system-iface.so
-VNDK-core: libxml2.so
-VNDK-core: libyuv.so
-VNDK-core: libziparchive.so
-VNDK-private: libbacktrace.so
-VNDK-private: libbinderthreadstate.so
-VNDK-private: libblas.so
-VNDK-private: libcompiler_rt.so
-VNDK-private: libft2.so
-VNDK-private: libgui.so