From 2d03a5e677e528459785a1d8273a63f0fe00837c Mon Sep 17 00:00:00 2001 From: Yi-Yo Chiang Date: Fri, 23 Apr 2021 16:04:29 +0800 Subject: Fix linux_bionic build After adding "toybox" to cvd-host_package.tar.gz, aosp_cf_arm64_phone-userdebug failed to build with error: In file included from external/toybox/lib/args.c:10: external/toybox/toys.h:8:10: fatal error: 'generated/config.h' file not found #include "generated/config.h" ^~~~~~~~~~~~~~~~~~~~ 1 error generated. This is because toybox is not configured to be built on linux_bionic host, and aosp_cf_arm64_phone is trying to build the HOST_CROSS variant of toybox, which is arm64 linux_bionic. Bug: 185883642 Test: lunch aosp_cf_arm64_phone-userdebug && m Change-Id: I64418fb5f88f8a8b8b7e6905b58cc1f7e68ab2e8 --- Android.bp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Android.bp b/Android.bp index 9a5e2eac..3beb024a 100644 --- a/Android.bp +++ b/Android.bp @@ -445,6 +445,10 @@ cc_defaults { local_include_dirs: ["android/linux"], }, + linux_bionic: { + local_include_dirs: ["android/linux"], + }, + darwin: { local_include_dirs: ["android/mac"], cflags: [ -- cgit v1.2.3