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

Merge "Avoid duplicate genrule locations"

Browse source
This commit is contained in:
Treehugger Robot 2022-02-08 19:36:40 +00:00 committed by Gerrit Code Review
commit c81de9373a
1 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libc/Android.bp
View file

@ -2636,16 +2636,12 @@ cc_genrule {
srcs: [
"kernel/uapi/**/*.h",
"kernel/android/**/*.h",
"kernel/uapi/linux/capability.h",
"kernel/android/scsi/scsi/scsi.h",
"kernel/android/uapi/linux/compiler.h",
"execinfo/include/**/*.h",
"execinfo/include/execinfo.h",
"b64/include/**/*.h",
"b64/include/bionic/b64.h",
// This file is used to identify the location of the bionic/libc directory
// to simplify accessing the rest of the files.
"NOTICE",
":libc_musl_sysroot_bionic_arch_headers",
],
@ -2655,19 +2651,20 @@ cc_genrule {
"merge_zips",
"zip2zip",
],
cmd: "$(location soong_zip) -o $(genDir)/sysroot.zip -symlinks=false" +
cmd: "BIONIC_LIBC_DIR=$$(dirname $(location NOTICE)) && " +
"$(location soong_zip) -o $(genDir)/sysroot.zip -symlinks=false" +
// headers
" -P include " +
" -C $$(dirname $(location kernel/uapi/linux/capability.h))/.. " +
" -D $$(dirname $(location kernel/uapi/linux/capability.h))/.. " +
" -C $$(dirname $(location kernel/android/scsi/scsi/scsi.h))/.. " +
" -D $$(dirname $(location kernel/android/scsi/scsi/scsi.h))/.. " +
" -C $$(dirname $(location kernel/android/uapi/linux/compiler.h))/.. " +
" -D $$(dirname $(location kernel/android/uapi/linux/compiler.h))/.. " +
" -C $$(dirname $(location execinfo/include/execinfo.h)) " +
" -D $$(dirname $(location execinfo/include/execinfo.h)) " +
" -C $$(dirname $(location b64/include/bionic/b64.h))/.. " +
" -D $$(dirname $(location b64/include/bionic/b64.h))/.. " +
" -C $${BIONIC_LIBC_DIR}/kernel/uapi " +
" -D $${BIONIC_LIBC_DIR}/kernel/uapi " +
" -C $${BIONIC_LIBC_DIR}/kernel/android/scsi " +
" -D $${BIONIC_LIBC_DIR}/kernel/android/scsi " +
" -C $${BIONIC_LIBC_DIR}/kernel/android/uapi " +
" -D $${BIONIC_LIBC_DIR}/kernel/android/uapi " +
" -C $${BIONIC_LIBC_DIR}/execinfo/include " +
" -D $${BIONIC_LIBC_DIR}/execinfo/include " +
" -C $${BIONIC_LIBC_DIR}/b64/include " +
" -D $${BIONIC_LIBC_DIR}/b64/include " +
" && " +
"$(location merge_zips) $(out) $(location :libc_musl_sysroot_bionic_arch_headers) $(genDir)/sysroot.zip",
}