diff options
author | Hsin-Yi Chen <hsinyichen@google.com> | 2024-04-08 15:44:57 +0800 |
---|---|---|
committer | Hsin-Yi Chen <hsinyichen@google.com> | 2024-04-08 17:26:38 +0800 |
commit | 8386c93b31753938726d6b0b351787bf6119ca10 (patch) | |
tree | 89b9b2fe890806a5145f86724e0e74c31edf026d | |
parent | f04715371b16a39b56e19fcdca2b5bc91623db66 (diff) | |
download | vndk-8386c93b31753938726d6b0b351787bf6119ca10.tar.gz |
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
-rw-r--r-- | 34/64/arm/source-based/config.json | 19 | ||||
-rw-r--r-- | 34/64/arm64/source-based/config.json | 19 | ||||
-rw-r--r-- | 34/64/arm_arm64/source-based/config.json | 19 | ||||
-rw-r--r-- | 34/64/x86/source-based/config.json | 19 | ||||
-rw-r--r-- | 34/64/x86_64/source-based/config.json | 19 | ||||
-rw-r--r-- | 34/64/x86_x86_64/source-based/config.json | 19 |
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", |