Skip to content

Add android 13.0 headers - #6

Open
Herrie82 wants to merge 2 commits into
halium-13.0from
herrie/halium-13.0
Open

Add android 13.0 headers#6
Herrie82 wants to merge 2 commits into
halium-13.0from
herrie/halium-13.0

Conversation

@Herrie82

Copy link
Copy Markdown

Updated headers for Android 13.0

Generated from a halium-13.0 tree with libhybris' own
utils/extract-headers.sh, which detected ANDROID_VERSION_MAJOR 13 correctly.

extract-headers.sh does not emit everything the published sets carry, so three
directories were added on top from their canonical in-tree sources - not the
prebuilts/vndk/v32/x86 copies that a naive search turns up first:

    log/     system/logging/liblog/include/log         12 files
    camera/  frameworks/av/camera/ndk/include/camera    8 files
    media/   frameworks/av/media/ndk/include/media     10 files

All three match the halium-11.0 file names exactly.

libnfc-nxp/ is dropped: those 145 headers are a legacy vendored NFC dump that
does not exist anywhere in an AOSP 13 tree. libhybris' configure probes for
libnfc-nxp/phLibNfc.h and only adds the include path when it is present, so its
absence is handled rather than fatal.

Note that android-headers describes the vendor HAL interface rather than the
system image, so a device whose vendor is older does not need this - Droidian
still build-depends on android-headers-30 for Halium 12 and 13. This is for
trees whose vendor is Android 13.
A file-level comparison against halium-11.0 showed four headers the generated
set was short of, once libnfc-nxp is set aside. Two are real and were simply
not emitted by extract-headers.sh:

    android/log.h                      system/logging/liblog/include/android
    private/android_filesystem_config.h  system/core/libcutils/include/private

android/log.h in particular is included very widely, so its absence would have
surfaced as a confusing failure in the first consumer that needed it rather
than as anything obviously to do with the header set.

The other two are genuinely retired in AOSP 13 rather than missing:

    hardware/keymaster0.h          the keymaster0 HAL is gone from the tree
    private/bionic_string_utils.h  no longer in bionic; the only copies left
                                   are the ones libhybris vendors under
                                   hybris/common/*/bionic, so anything needing
                                   it already has it

android/ now has the same nine files as halium-11.0.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant