From cf045d8837c13e2e65a5ddf216dffc2f3e0e7e88 Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Mon, 8 Jul 2019 22:21:06 +0100 Subject: [PATCH] ANDROID: build configs: switch prebuilt path location Move to a kernel specific prebuilt path. Bug: 135922132 Change-Id: I8755f8f0154eecc86ad598be7a7811e9d8f068ed Signed-off-by: Matthias Maennich --- build.config.cuttlefish.aarch64 | 2 +- build.config.cuttlefish.x86_64 | 2 +- build.config.gki.aarch64 | 2 +- build.config.gki.x86_64 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.config.cuttlefish.aarch64 b/build.config.cuttlefish.aarch64 index 40c8d7a5219c..b9115335e3fc 100644 --- a/build.config.cuttlefish.aarch64 +++ b/build.config.cuttlefish.aarch64 @@ -8,7 +8,7 @@ EXTRA_CMDS='' KERNEL_DIR=common POST_DEFCONFIG_CMDS="check_defconfig" CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin -BUILDTOOLS_PREBUILT_BIN=prebuilts/build-tools/path/linux-x86 +BUILDTOOLS_PREBUILT_BIN=build/build-tools/path/linux-x86 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin FILES=" arch/arm64/boot/Image.gz diff --git a/build.config.cuttlefish.x86_64 b/build.config.cuttlefish.x86_64 index c9496b0d2ce6..bdcbecea3ce1 100644 --- a/build.config.cuttlefish.x86_64 +++ b/build.config.cuttlefish.x86_64 @@ -8,7 +8,7 @@ EXTRA_CMDS='' KERNEL_DIR=common POST_DEFCONFIG_CMDS="check_defconfig" CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin -BUILDTOOLS_PREBUILT_BIN=prebuilts/build-tools/path/linux-x86 +BUILDTOOLS_PREBUILT_BIN=build/build-tools/path/linux-x86 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin FILES=" arch/x86/boot/bzImage diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64 index fce42ab0daa3..b2399812513e 100644 --- a/build.config.gki.aarch64 +++ b/build.config.gki.aarch64 @@ -8,7 +8,7 @@ EXTRA_CMDS='' KERNEL_DIR=common POST_DEFCONFIG_CMDS="check_defconfig" CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin -BUILDTOOLS_PREBUILT_BIN=prebuilts/build-tools/path/linux-x86 +BUILDTOOLS_PREBUILT_BIN=build/build-tools/path/linux-x86 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin FILES=" arch/arm64/boot/Image.gz diff --git a/build.config.gki.x86_64 b/build.config.gki.x86_64 index 3ce45e962732..b5a7f4600101 100644 --- a/build.config.gki.x86_64 +++ b/build.config.gki.x86_64 @@ -8,7 +8,7 @@ EXTRA_CMDS='' KERNEL_DIR=common POST_DEFCONFIG_CMDS="check_defconfig" CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin -BUILDTOOLS_PREBUILT_BIN=prebuilts/build-tools/path/linux-x86 +BUILDTOOLS_PREBUILT_BIN=build/build-tools/path/linux-x86 LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin FILES=" arch/x86/boot/bzImage