ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert^2 "Deprecating libvendorsupport_llndk_headers"

Browse source 
ab8f9717f1

Change-Id: Ie981692be554942df762a4c9be7c250b0b202f31
This commit is contained in:
Jooyung Han 2024-11-09 02:41:06 +00:00 • committed by Gerrit Code Review
parent ab8f9717f1
commit dbb080d9bf
2 changed files with 0 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libvendorsupport/Android.bp
View file

@ -35,32 +35,3 @@ cc_library {
"libbase",
],
}
cc_library_headers {
name: "libvendorsupport_llndk_headers",
host_supported: true,
vendor_available: true,
recovery_available: true,
ramdisk_available: true,
vendor_ramdisk_available: true,
native_bridge_supported: true,
export_include_dirs: ["include_llndk"],
llndk: {
llndk_headers: true,
},
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
min_sdk_version: "apex_inherit",
system_shared_libs: [],
stl: "none",
// This header library is used for libc and must be available to any sdk
// versions.
// Setting sdk_version to the lowest version allows the dependencies.
sdk_version: "1",
}

45
libvendorsupport/include_llndk/android/llndk-versioning.h
View file

@ -1,45 +0,0 @@
// Copyright (C) 2024 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
// LLNDK (https://source.android.com/docs/core/architecture/vndk/build-system#ll-ndk) is similar to
// NDK, but uses its own versioning of YYYYMM format for vendor builds. The LLNDK symbols are
// enabled when the vendor api level is equal to or newer than the ro.board.api_level. These symbols
// must be annotated in map.txt files with the `# llndk=YYYYMM` annotation. They also must be marked
// with `__INTRODUCED_IN_LLNDK(YYYYMM)` in the header files. It leaves a no-op annotation for ABI
// analysis.
#if !defined(__INTRODUCED_IN_LLNDK)
#define __INTRODUCED_IN_LLNDK(vendor_api_level) \
__attribute__((annotate("introduced_in_llndk=" #vendor_api_level)))
#endif
#if defined(__ANDROID_VENDOR_API__)
// __ANDROID_VENDOR_API__ is defined only for vendor or product variant modules.
// Use this macro as an `if` statement to call an API that are available to both NDK and LLNDK.
// This returns true for vendor or product modules if the vendor_api_level is less than or equal to
// the ro.board.api_level.
#define API_LEVEL_AT_LEAST(sdk_api_level, vendor_api_level) \
constexpr(__ANDROID_VENDOR_API__ >= vendor_api_level)
#else // __ANDROID_VENDOR_API__
// For non-vendor modules, API_LEVEL_AT_LEAST is replaced with __builtin_available(sdk_api_level) to
// guard the API for __INTRODUCED_IN.
#if !defined(API_LEVEL_AT_LEAST)
#define API_LEVEL_AT_LEAST(sdk_api_level, vendor_api_level) \
(__builtin_available(android sdk_api_level, *))
#endif
#endif // __ANDROID_VENDOR_API__