Merge "platform/build/make - S is now 31" into sc-dev (83ecfb50) · Commits · e / os / android_build

core/config.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -769,7 +769,7 @@ BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE))
		# 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 := 30
		sepolicy_major_vers := 31
		sepolicy_minor_vers := 0

		ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))

core/version_defaults.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ MAX_PLATFORM_VERSION :=
		# The last stable version name of the platform that was released. During
		# development, this stays at that previous version, while the codename indicates
		# further work based on the previous version.
		PLATFORM_VERSION_LAST_STABLE := 11
		PLATFORM_VERSION_LAST_STABLE := 12
		.KATI_READONLY := PLATFORM_VERSION_LAST_STABLE

		# These are the current development codenames, if the build is not a final
		@@ -151,7 +151,7 @@ ifndef PLATFORM_SDK_VERSION
		# 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 := 30
		PLATFORM_SDK_VERSION := 31
		endif
		.KATI_READONLY := PLATFORM_SDK_VERSION

target/product/gsi/31.txt

0 → 100644

+223 −0

Original line number	Diff line number	Diff line
		LLNDK: libEGL.so
		LLNDK: libGLESv1_CM.so
		LLNDK: libGLESv2.so
		LLNDK: libGLESv3.so
		LLNDK: libRS.so
		LLNDK: libandroid_net.so
		LLNDK: libbinder_ndk.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: libselinux.so
		LLNDK: libsync.so
		LLNDK: libvndksupport.so
		LLNDK: libvulkan.so
		VNDK-SP: android.hardware.common-V2-ndk_platform.so
		VNDK-SP: android.hardware.common.fmq-V1-ndk_platform.so
		VNDK-SP: android.hardware.graphics.common-V2-ndk_platform.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.graphics.mapper@4.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-impl.so
		VNDK-SP: android.hidl.memory@1.0.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: libblas.so
		VNDK-SP: libc++.so
		VNDK-SP: libcompiler_rt.so
		VNDK-SP: libcutils.so
		VNDK-SP: libdmabufheap.so
		VNDK-SP: libgralloctypes.so
		VNDK-SP: libhardware.so
		VNDK-SP: libhidlbase.so
		VNDK-SP: libhidlmemory.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.hardware.audio.common@2.0.so
		VNDK-core: android.hardware.authsecret-V1-ndk_platform.so
		VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk_platform.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.gnss-V1-ndk_platform.so
		VNDK-core: android.hardware.graphics.allocator@2.0.so
		VNDK-core: android.hardware.graphics.allocator@3.0.so
		VNDK-core: android.hardware.graphics.allocator@4.0.so
		VNDK-core: android.hardware.graphics.bufferqueue@1.0.so
		VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
		VNDK-core: android.hardware.health.storage-V1-ndk_platform.so
		VNDK-core: android.hardware.identity-V3-ndk_platform.so
		VNDK-core: android.hardware.keymaster-V3-ndk_platform.so
		VNDK-core: android.hardware.light-V1-ndk_platform.so
		VNDK-core: android.hardware.media.bufferpool@2.0.so
		VNDK-core: android.hardware.media.omx@1.0.so
		VNDK-core: android.hardware.media@1.0.so
		VNDK-core: android.hardware.memtrack-V1-ndk_platform.so
		VNDK-core: android.hardware.memtrack@1.0.so
		VNDK-core: android.hardware.oemlock-V1-ndk_platform.so
		VNDK-core: android.hardware.power-V2-ndk_platform.so
		VNDK-core: android.hardware.power.stats-V1-ndk_platform.so
		VNDK-core: android.hardware.rebootescrow-V1-ndk_platform.so
		VNDK-core: android.hardware.security.keymint-V1-ndk_platform.so
		VNDK-core: android.hardware.security.secureclock-V1-ndk_platform.so
		VNDK-core: android.hardware.security.sharedsecret-V1-ndk_platform.so
		VNDK-core: android.hardware.soundtrigger@2.0-core.so
		VNDK-core: android.hardware.soundtrigger@2.0.so
		VNDK-core: android.hardware.vibrator-V2-ndk_platform.so
		VNDK-core: android.hardware.weaver-V1-ndk_platform.so
		VNDK-core: android.hidl.token@1.0-utils.so
		VNDK-core: android.hidl.token@1.0.so
		VNDK-core: android.system.keystore2-V1-ndk_platform.so
		VNDK-core: android.system.suspend@1.0.so
		VNDK-core: libaudioroute.so
		VNDK-core: libaudioutils.so
		VNDK-core: libbinder.so
		VNDK-core: libbufferqueueconverter.so
		VNDK-core: libcamera_metadata.so
		VNDK-core: libcap.so
		VNDK-core: libcn-cbor.so
		VNDK-core: libcodec2.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: libjpeg.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: libpcre2.so
		VNDK-core: libpiex.so
		VNDK-core: libpng.so
		VNDK-core: libpower.so
		VNDK-core: libprocinfo.so
		VNDK-core: libradio_metadata.so
		VNDK-core: libspeexresampler.so
		VNDK-core: libsqlite.so
		VNDK-core: libssl.so
		VNDK-core: libstagefright_bufferpool@2.0.so
		VNDK-core: libstagefright_bufferqueue_helper.so
		VNDK-core: libstagefright_foundation.so
		VNDK-core: libstagefright_omx.so
		VNDK-core: libstagefright_omx_utils.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: libwifi-system-iface.so
		VNDK-core: libxml2.so
		VNDK-core: libyuv.so
		VNDK-core: libziparchive.so
		VNDK-private: libbacktrace.so
		VNDK-private: libblas.so
		VNDK-private: libcompiler_rt.so
		VNDK-private: libft2.so
		VNDK-private: libgui.so
		VNDK-product: android.hardware.audio.common@2.0.so
		VNDK-product: android.hardware.configstore@1.0.so
		VNDK-product: android.hardware.configstore@1.1.so
		VNDK-product: android.hardware.graphics.allocator@2.0.so
		VNDK-product: android.hardware.graphics.allocator@3.0.so
		VNDK-product: android.hardware.graphics.allocator@4.0.so
		VNDK-product: android.hardware.graphics.bufferqueue@1.0.so
		VNDK-product: android.hardware.graphics.bufferqueue@2.0.so
		VNDK-product: android.hardware.graphics.common@1.0.so
		VNDK-product: android.hardware.graphics.common@1.1.so
		VNDK-product: android.hardware.graphics.common@1.2.so
		VNDK-product: android.hardware.graphics.mapper@2.0.so
		VNDK-product: android.hardware.graphics.mapper@2.1.so
		VNDK-product: android.hardware.graphics.mapper@3.0.so
		VNDK-product: android.hardware.graphics.mapper@4.0.so
		VNDK-product: android.hardware.media.bufferpool@2.0.so
		VNDK-product: android.hardware.media.omx@1.0.so
		VNDK-product: android.hardware.media@1.0.so
		VNDK-product: android.hardware.memtrack@1.0.so
		VNDK-product: android.hardware.renderscript@1.0.so
		VNDK-product: android.hardware.soundtrigger@2.0.so
		VNDK-product: android.hidl.memory.token@1.0.so
		VNDK-product: android.hidl.memory@1.0.so
		VNDK-product: android.hidl.safe_union@1.0.so
		VNDK-product: android.hidl.token@1.0.so
		VNDK-product: android.system.suspend@1.0.so
		VNDK-product: libaudioutils.so
		VNDK-product: libbacktrace.so
		VNDK-product: libbase.so
		VNDK-product: libc++.so
		VNDK-product: libcamera_metadata.so
		VNDK-product: libcap.so
		VNDK-product: libcompiler_rt.so
		VNDK-product: libcrypto.so
		VNDK-product: libcurl.so
		VNDK-product: libcutils.so
		VNDK-product: libevent.so
		VNDK-product: libexpat.so
		VNDK-product: libfmq.so
		VNDK-product: libhidlbase.so
		VNDK-product: libhidlmemory.so
		VNDK-product: libion.so
		VNDK-product: libjpeg.so
		VNDK-product: libjsoncpp.so
		VNDK-product: libldacBT_abr.so
		VNDK-product: libldacBT_enc.so
		VNDK-product: liblz4.so
		VNDK-product: liblzma.so
		VNDK-product: libminijail.so
		VNDK-product: libnl.so
		VNDK-product: libpcre2.so
		VNDK-product: libpiex.so
		VNDK-product: libpng.so
		VNDK-product: libprocessgroup.so
		VNDK-product: libprocinfo.so
		VNDK-product: libspeexresampler.so
		VNDK-product: libssl.so
		VNDK-product: libtinyalsa.so
		VNDK-product: libtinyxml2.so
		VNDK-product: libunwindstack.so
		VNDK-product: libutils.so
		VNDK-product: libutilscallstack.so
		VNDK-product: libwifi-system-iface.so
		VNDK-product: libxml2.so
		VNDK-product: libyuv.so
		VNDK-product: libz.so
		VNDK-product: libziparchive.so