tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Explicitly add the include path for android_filesystem_config.h

Browse source 
android_filesystem_config.h is found since system/core/include is on
the include path for all projects and contains a symlink to the real
android_filesystem_config.h.  This is fragile and the below bug seeks
to remove this symlink and have users correctly depend on
libcutils_headers.

In bionic, libcutils_headers header library cannot be used due to
cyclic dependencies, so it gets the actual include path instead, which
is less bad than depending on the build system injecting the for all
modules.

Bug: 165825252
Test: build
Change-Id: Id43bdea9553b1174ceb3efc2a3ed505888619c62
This commit is contained in:
Tom Cherry 2020-09-17 09:36:25 -07:00
parent bfb889002b
commit 379ed1ef62
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libc/Android.bp
View file

@ -62,6 +62,8 @@ cc_defaults {
cppflags: [], cppflags: [],
include_dirs: [ include_dirs: [
"bionic/libc/async_safe/include", "bionic/libc/async_safe/include",
// For android_filesystem_config.h.
"system/core/libcutils/include",
], ],
header_libs: [ header_libs: [

1
tests/Android.bp
View file

@ -44,6 +44,7 @@ cc_defaults {
// For glibc. // For glibc.
"-D__STDC_LIMIT_MACROS", "-D__STDC_LIMIT_MACROS",
], ],
header_libs: ["libcutils_headers"],
// Ensure that the tests exercise shadow call stack support and // Ensure that the tests exercise shadow call stack support and
// the hint space PAC/BTI instructions. // the hint space PAC/BTI instructions.
arch: { arch: {