From 06a7078ce74ab5c7801a165b8145859678831fb8 Mon Sep 17 00:00:00 2001
From: Juan Ramos <juan@lunarg.com>
Date: Wed, 4 Jan 2023 14:02:19 -0700
Subject: [PATCH] build: Remove AMD_EXTENSIONS / NV_EXTENSIONS defines

These defines aren't needed anymore
---
 Android.mk  | 4 ++--
 BUILD.bazel | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Android.mk b/Android.mk
index 40cddb75..8e2fac0a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 The Khronos Group Inc.
+# Copyright (C) 2020-2023 The Khronos Group Inc.
 #
 # All rights reserved.
 #
@@ -53,7 +53,7 @@ $(eval $(call gen_glslang_build_info_h))
 
 GLSLANG_OS_FLAGS := -DGLSLANG_OSINCLUDE_UNIX
 # AMD and NV extensions are turned on by default in upstream Glslang.
-GLSLANG_DEFINES:= -DAMD_EXTENSIONS -DNV_EXTENSIONS -DENABLE_HLSL $(GLSLANG_OS_FLAGS)
+GLSLANG_DEFINES:= -DENABLE_HLSL $(GLSLANG_OS_FLAGS)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:=OSDependent
diff --git a/BUILD.bazel b/BUILD.bazel
index d7a65787..8dd76e07 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 The Khronos Group Inc.
+# Copyright (C) 2020-2023 The Khronos Group Inc.
 #
 # All rights reserved.
 #
@@ -125,10 +125,8 @@ cc_library(
     ],
     copts = COMMON_COPTS,
     defines = [
-        "AMD_EXTENSIONS",
         "ENABLE_HLSL=0",
         "ENABLE_OPT=0",
-        "NV_EXTENSIONS",
     ],
     linkopts = select({
         "@bazel_tools//src/conditions:windows": [""],