commit aab2ad700be2836bae44046589216b576fcb10ab
author Liz Kammer <eakammer@google.com> Mon Mar 15 18:03:24 2021 -0400
committer Liz Kammer <eakammer@google.com> Mon Mar 15 18:03:24 2021 -0400
tree cfa3790ed9fe5c8f20904219c89af13eb9f151c1
parent 051b454ff1a9608b304ad985a584575f979dcd0f

Add missing includes for crtend modules

Test: convert bp2build_available targets to BUILD and bazel build
      --platforms=//build/bazel/platforms:generic_arm64 //bionic/...
Change-Id: I1cbdbf1d65d7dbe95665aaac08004c80f82433e9

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index df8871a..ba7253f 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2137,7 +2137,10 @@
 
 cc_object {
     name: "crtend_so",
-    local_include_dirs: ["include"],
+    local_include_dirs: [
+        "include",
+        "private",  // crtend_so.S depends on private/bionic_asm_arm64.h
+    ],
     srcs: ["arch-common/bionic/crtend_so.S"],
 
     defaults: ["crt_so_defaults"],
@@ -2209,7 +2212,10 @@
     // We rename crtend.o to crtend_android.o to avoid a
     // name clash between gcc and bionic.
     name: "crtend_android",
-    local_include_dirs: ["include"],
+    local_include_dirs: [
+        "include",
+        "private",  // crtend.S depends on private/bionic_asm_arm64.h
+    ],
     srcs: ["arch-common/bionic/crtend.S"],
 
     defaults: ["crt_defaults"],