Copy config.json from ndk directoryHEADmastermain

This commit copies the configuration for libnativewindow, and changes
the version name from "35" to "202404".

This commit also removes "advice_only" from vndk directory. It resumes
cross-version ABI checks for LLNDK. The checks for VNDK have been
removed from the build system. They will not cause errors.

Test: make
Bug: 332959609
Change-Id: Ic9c9cf57af1b91ebc335f3d26aba8a5603c34c08

6 files changed, 84 insertions, 30 deletions

diff --git a/34/64/arm/source-based/config.json b/34/64/arm/source-based/config.json
index 5da2c2ba..2b8aa7a8 100644
--- a/34/64/arm/source-based/config.json
+++ b/34/64/arm/source-based/config.json
@@ -1,9 +1,4 @@
 {
-  "global": {
-    "flags": {
-      "advice_only": true
-    }
-  },
   "libbinder": [
     {
       "target_version": "current",
@@ -28,6 +23,20 @@
       }
     }
   ],
+  "libnativewindow": [
+    {
+      "target_version": "current",
+      "ignore_linker_set_keys": [
+        "_ZN7android34AHardwareBuffer_isValidPixelFormatEj",
+      ],
+    },
+    {
+      "target_version": "202404",
+      "ignore_linker_set_keys": [
+        "_ZN7android34AHardwareBuffer_isValidPixelFormatEj",
+      ],
+    },
+  ],
   "libui": [
     {
       "target_version": "current",
diff --git a/34/64/arm64/source-based/config.json b/34/64/arm64/source-based/config.json
index 5da2c2ba..2b8aa7a8 100644
--- a/34/64/arm64/source-based/config.json
+++ b/34/64/arm64/source-based/config.json
@@ -1,9 +1,4 @@
 {
-  "global": {
-    "flags": {
-      "advice_only": true
-    }
-  },
   "libbinder": [
     {
       "target_version": "current",
@@ -28,6 +23,20 @@
       }
     }
   ],
+  "libnativewindow": [
+    {
+      "target_version": "current",
+      "ignore_linker_set_keys": [
+        "_ZN7android34AHardwareBuffer_isValidPixelFormatEj",
+      ],
+    },
+    {
+      "target_version": "202404",
+      "ignore_linker_set_keys": [
+        "_ZN7android34AHardwareBuffer_isValidPixelFormatEj",
+      ],
+    },
+  ],
   "libui": [
     {
       "target_version": "current",
diff --git a/34/64/arm_arm64/source-based/config.json b/34/64/arm_arm64/source-based/config.json
index 5da2c2ba..2b8aa7a8 100644
--- a/34/64/arm_arm64/source-based/config.json
+++ b/34/64/arm_arm64/source-based/config.json
@@ -1,9 +1,4 @@
 {
-  "global": {
-    "flags": {
-      "advice_only": true
-    }
-  },
   "libbinder": [
     {
       "target_version": "current",
@@ -28,6 +23,20 @@
       }
     }
   ],
+  "libnativewindow": [
+    {
+      "target_version": "current",
+      "ignore_linker_set_keys": [
+        "_ZN7android34AHardwareBuffer_isValidPixelFormatEj",
+      ],
+    },
+    {
+      "target_version": "202404",
+      "ignore_linker_set_keys": [
+        "_ZN7android34AHardwareBuffer_isValidPixelFormatEj",
+      ],
+    },
+  ],
   "libui": [
     {
       "target_version": "current",
diff --git a/34/64/x86/source-based/config.json b/34/64/x86/source-based/config.json
index 5da2c2ba..2b8aa7a8 100644
--- a/34/64/x86/source-based/config.json
+++ b/34/64/x86/source-based/config.json
@@ -1,9 +1,4 @@
 {
-  "global": {
-    "flags": {
-      "advice_only": true
-    }
-  },
   "libbinder": [
     {
       "target_version": "current",
@@ -28,6 +23,20 @@
       }
     }
   ],
+  "libnativewindow": [
+    {
+      "target_version": "current",
+      "ignore_linker_set_keys": [
+        "_ZN7android34AHardwareBuffer_isValidPixelFormatEj",
+      ],
+    },
+    {
+      "target_version": "202404",
+      "ignore_linker_set_keys": [
+        "_ZN7android34AHardwareBuffer_isValidPixelFormatEj",
+      ],
+    },
+  ],
   "libui": [
     {
       "target_version": "current",
diff --git a/34/64/x86_64/source-based/config.json b/34/64/x86_64/source-based/config.json
index 5da2c2ba..2b8aa7a8 100644
--- a/34/64/x86_64/source-based/config.json
+++ b/34/64/x86_64/source-based/config.json
@@ -1,9 +1,4 @@
 {
-  "global": {
-    "flags": {
-      "advice_only": true
-    }
-  },
   "libbinder": [
     {
       "target_version": "current",
@@ -28,6 +23,20 @@
       }
     }
   ],
+  "libnativewindow": [
+    {
+      "target_version": "current",
+      "ignore_linker_set_keys": [
+        "_ZN7android34AHardwareBuffer_isValidPixelFormatEj",
+      ],
+    },
+    {
+      "target_version": "202404",
+      "ignore_linker_set_keys": [
+        "_ZN7android34AHardwareBuffer_isValidPixelFormatEj",
+      ],
+    },
+  ],
   "libui": [
     {
       "target_version": "current",
diff --git a/34/64/x86_x86_64/source-based/config.json b/34/64/x86_x86_64/source-based/config.json
index 5da2c2ba..2b8aa7a8 100644
--- a/34/64/x86_x86_64/source-based/config.json
+++ b/34/64/x86_x86_64/source-based/config.json
@@ -1,9 +1,4 @@
 {
-  "global": {
-    "flags": {
-      "advice_only": true
-    }
-  },
   "libbinder": [
     {
       "target_version": "current",
@@ -28,6 +23,20 @@
       }
     }
   ],
+  "libnativewindow": [
+    {
+      "target_version": "current",
+      "ignore_linker_set_keys": [
+        "_ZN7android34AHardwareBuffer_isValidPixelFormatEj",
+      ],
+    },
+    {
+      "target_version": "202404",
+      "ignore_linker_set_keys": [
+        "_ZN7android34AHardwareBuffer_isValidPixelFormatEj",
+      ],
+    },
+  ],
   "libui": [
     {
       "target_version": "current",