From db794f4893ea170fdccef59958086df499593cb3 Mon Sep 17 00:00:00 2001
From: Hsin-Yi Chen <hsinyichen@google.com>
Date: Thu, 2 Mar 2023 05:23:58 +0000
Subject: Revert "Ignore security_load_policy in libselinux in version 33"

This reverts commit 83198bdb63dd5513b3223a0e750e214a61719660.

Bug: 259148872
Test: make
Reason for revert:
The ABI tools can determine extensions to parameter qualifiers.
https://android-review.googlesource.com/2445932

Change-Id: Ib616f3fe1bcee568678c815376ad7ecd13c476f5
---
 33/64/arm/source-based/config.json        | 10 ----------
 33/64/arm64/source-based/config.json      | 10 ----------
 33/64/arm_arm64/source-based/config.json  | 10 ----------
 33/64/x86/source-based/config.json        | 10 ----------
 33/64/x86_64/source-based/config.json     | 10 ----------
 33/64/x86_x86_64/source-based/config.json | 10 ----------
 6 files changed, 60 deletions(-)
 delete mode 100644 33/64/arm/source-based/config.json
 delete mode 100644 33/64/arm64/source-based/config.json
 delete mode 100644 33/64/arm_arm64/source-based/config.json
 delete mode 100644 33/64/x86/source-based/config.json
 delete mode 100644 33/64/x86_64/source-based/config.json
 delete mode 100644 33/64/x86_x86_64/source-based/config.json

diff --git a/33/64/arm/source-based/config.json b/33/64/arm/source-based/config.json
deleted file mode 100644
index 678ea04..0000000
--- a/33/64/arm/source-based/config.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "libselinux": [
-    {
-      "target_version": "34",
-      "ignore_linker_set_keys": [
-        "security_load_policy"
-      ]
-    }
-  ]
-}
diff --git a/33/64/arm64/source-based/config.json b/33/64/arm64/source-based/config.json
deleted file mode 100644
index 678ea04..0000000
--- a/33/64/arm64/source-based/config.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "libselinux": [
-    {
-      "target_version": "34",
-      "ignore_linker_set_keys": [
-        "security_load_policy"
-      ]
-    }
-  ]
-}
diff --git a/33/64/arm_arm64/source-based/config.json b/33/64/arm_arm64/source-based/config.json
deleted file mode 100644
index 678ea04..0000000
--- a/33/64/arm_arm64/source-based/config.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "libselinux": [
-    {
-      "target_version": "34",
-      "ignore_linker_set_keys": [
-        "security_load_policy"
-      ]
-    }
-  ]
-}
diff --git a/33/64/x86/source-based/config.json b/33/64/x86/source-based/config.json
deleted file mode 100644
index 678ea04..0000000
--- a/33/64/x86/source-based/config.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "libselinux": [
-    {
-      "target_version": "34",
-      "ignore_linker_set_keys": [
-        "security_load_policy"
-      ]
-    }
-  ]
-}
diff --git a/33/64/x86_64/source-based/config.json b/33/64/x86_64/source-based/config.json
deleted file mode 100644
index 678ea04..0000000
--- a/33/64/x86_64/source-based/config.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "libselinux": [
-    {
-      "target_version": "34",
-      "ignore_linker_set_keys": [
-        "security_load_policy"
-      ]
-    }
-  ]
-}
diff --git a/33/64/x86_x86_64/source-based/config.json b/33/64/x86_x86_64/source-based/config.json
deleted file mode 100644
index 678ea04..0000000
--- a/33/64/x86_x86_64/source-based/config.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "libselinux": [
-    {
-      "target_version": "34",
-      "ignore_linker_set_keys": [
-        "security_load_policy"
-      ]
-    }
-  ]
-}
-- 
cgit v1.2.3