kernel: Use full path to the gcc/g++ commands
gcc and g++ are now dissallowed commands so just run the full commands
Change-Id: I2ba5675a3f5410f51fc37b723714b35f1e4628c8
diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index bbbbddc..ef2e879 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -7,8 +7,8 @@
}
bootstrap_go_package {
- name: "soong-lineage-generator",
- pkgPath: "lineage/soong/generator",
+ name: "soong-omnirom-generator",
+ pkgPath: "omnirom/soong/generator",
deps: [
"blueprint",
"blueprint-pathtools",
@@ -23,7 +23,7 @@
pluginFor: ["soong_build"],
}
-lineage_generator {
+omni_generator {
name: "generated_kernel_includes",
// The headers make command
diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk
index 51f321a..e31d15e 100644
--- a/config/BoardConfigKernel.mk
+++ b/config/BoardConfigKernel.mk
@@ -129,3 +129,13 @@
# Set use the full path to the make command
KERNEL_MAKE_CMD := $(BUILD_TOP)/prebuilts/build-tools/$(HOST_OS)-x86/bin/make
+
+# Set the full path to the gcc command
+GCC_PREBUILTS := $(BUILD_TOP)/prebuilts/gcc/$(HOST_OS)-x86/host
+ifeq ($(HOST_OS),darwin)
+KERNEL_HOST_TOOLCHAIN_ROOT := $(GCC_PREBUILTS)/i686-apple-darwin-4.2.1/bin/i686-apple-darwin11-
+else
+KERNEL_HOST_TOOLCHAIN_ROOT := $(GCC_PREBUILTS)/x86_64-linux-glibc2.17-4.8/bin/x86_64-linux-
+endif
+KERNEL_MAKE_FLAGS += HOSTCC=$(KERNEL_HOST_TOOLCHAIN_ROOT)gcc
+KERNEL_MAKE_FLAGS += HOSTCXX=$(KERNEL_HOST_TOOLCHAIN_ROOT)g++