commit a3be85ff256989ac0b5871aad7be1c5e28a76c3f
author Liz Kammer <eakammer@google.com> Wed Mar 17 16:19:15 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 17 16:19:15 2021 +0000
tree 37bd62bae74f5c2030afea62f7c3ef49e10bd9c5
parent aefa48de87e2e8bf6e183538f5483940639853e2
parent 76ae8abac54276fa2efc89b450927378d12b7ee0

Merge "Add missing includes for crtend modules" am: 6a4177c42d am: f8e3668ce2 am: 76ae8abac5

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1637585

Change-Id: I1338af10d63e14942d248239040e180f65aefe89

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index a502de5..4932e61 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2126,7 +2126,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"],
@@ -2181,7 +2184,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"],