Merge changes from topic "update-mesa-aosp" into main

* changes:
  ANDROID: external/mesa: update OWNERs
  ANDROID: mesa: add gfxstream-experimental to -Dvulkan-drivers
  ANDROID: mesa: import gfxstream
  ANDROID: mesa: add Android.bp files
  ANDROID: vulkan: allow building Vulkan without libcompiler
  ANDROID: vulkan/runtime: introduce vk_meta_object_list
  ANDROID: vulkan/util: introduce vk_util_compiler files
  ANDROID: vulkan: vk_compiler_* functions --> #ifdefs
  ANDROID: mesa: delete Android.mk and prebuilt generated files
  Merge 'upstream/main' into mesa-gfxstream-update

1 files changed, 28 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index 53507da7411..bce936a2ef7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,12 +20,12 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-
 soong_namespace {}
 
 // *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
 //     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
 //     DEPENDING ON IT IN YOUR PROJECT. ***
+
 package {
     default_applicable_licenses: ["external_mesa3d_license"],
 }
@@ -65,16 +65,34 @@ license {
     ],
 }
 
-build = ["Android.gen.bp"]
+cc_defaults {
+    name: "mesa_version_defaults",
+    cflags: ["-DPACKAGE_VERSION=\"24.2\""],
+}
+
+python_binary_host {
+    name: "git_sha1_gen",
+    main: "bin/git_sha1_gen.py",
+    srcs: [
+        "bin/git_sha1_gen.py",
+    ],
+}
+
+genrule {
+    name: "git_sha1_header",
+    out: ["git_sha1.h"],
+    tools: ["git_sha1_gen"],
+    cmd: "python3 $(location git_sha1_gen) " +
+        "--output $(location git_sha1.h)",
+}
 
 cc_library_headers {
     name: "mesa_common_headers",
+    vendor: true,
     export_include_dirs: [
         "src",
         "include",
     ],
-    host_supported: true,
-    vendor: true,
     visibility: [":__subpackages__"],
 }
 
@@ -82,13 +100,10 @@ cc_library_headers {
 cc_defaults {
     name: "mesa_common_defaults",
     defaults: ["mesa_version_defaults"],
-
     // uncomment to keep the debug symbols
     // strip: { none: true, },
-
     vendor: true,
     header_libs: ["mesa_common_headers"],
-
     cflags: [
         "-Wno-error",
         "-Werror=incompatible-pointer-types",
@@ -99,7 +114,6 @@ cc_defaults {
         "-Wno-mismatched-tags",
         // PACKAGE_VERSION is in mesa_version_defaults
         "-DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\"",
-
         // XXX: The following __STDC_*_MACROS defines should not be needed.
         // It's likely due to a bug elsewhere, but let's temporarily add them
         // here to fix the radeonsi build.
@@ -129,7 +143,6 @@ cc_defaults {
         "-DHAVE_DL_ITERATE_PHDR",
         "-DHAVE_LINUX_FUTEX_H",
         "-DHAVE_ENDIAN_H",
-        "-DHAVE_ZLIB",
         "-DMAJOR_IN_SYSMACROS",
         "-DVK_USE_PLATFORM_ANDROID_KHR",
         "-fvisibility=hidden",
@@ -144,6 +157,7 @@ cc_defaults {
         "-Wno-format",
         "-Wno-gnu-variable-sized-type-not-at-end",
         "-Wno-implicit-fallthrough",
+        "-Wno-implicit-int",
         "-Wno-incompatible-pointer-types",
         "-Wno-missing-braces",
         "-Wno-overloaded-virtual",
@@ -156,12 +170,13 @@ cc_defaults {
         "-Wno-uninitialized",
         "-Wno-implicit-const-int-float-conversion",
         "-Wno-sync-alignment",
+        "-Wno-implicit-function-declaration",
+        "-Wno-constant-conversion",
         "-DHAVE_TIMESPEC_GET",
+        "-DHAVE_STRUCT_TIMESPEC",
+        "-DHAVE_MEMFD_CREATE",
     ],
-
-    // mesa requires at least c99 compiler
-    c_std: "c99",
-
+    c_std: "c11",
     cppflags: [
         "-D__STDC_CONSTANT_MACROS",
         "-D__STDC_FORMAT_MACROS",
@@ -169,7 +184,6 @@ cc_defaults {
         "-Wno-error=non-virtual-dtor",
         "-Wno-non-virtual-dtor",
     ],
-
     arch: {
         arm: {
             neon: {
@@ -180,7 +194,6 @@ cc_defaults {
             cflags: ["-DUSE_AARCH64_ASM"],
         },
     },
-
     multilib: {
         lib32: {
             cflags: ["-DDEFAULT_DRIVER_DIR=\"/vendor/lib/dri\""],
@@ -189,13 +202,11 @@ cc_defaults {
             cflags: ["-DDEFAULT_DRIVER_DIR=\"/vendor/lib64/dri\""],
         },
     },
-
     product_variables: {
         platform_sdk_version: {
             cflags: ["-DANDROID_API_LEVEL=%d"],
         },
     },
-
     target: {
         host: {
             cflags: [