Commit Graph

15 Commits

Author SHA1 Message Date
JohnnLee
19a8d1300c Merge branch 'LA.UM.7.8.9.C2.08.00.00.618.110' via branch 'qcom-msm-4.9' into android-msm-pixel-4.9
Conflicts:
	Makefile
	drivers/char/adsprpc.c
	drivers/char/diag/diag_usb.c
	drivers/misc/qseecom.c
	drivers/mmc/core/sdio_cis.c
	drivers/mmc/host/sdhci-msm-ice.c
	drivers/net/usb/lan78xx.c
	drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
	drivers/soc/qcom/msm_smp2p.c
	drivers/usb/gadget/function/f_gsi.c
	include/linux/sched/sysctl.h
	net/netfilter/xt_qtaguid.c

Bug: 171355577
Change-Id: I0a4d226a334a5cc7e6013dba9e0857ae197e3ca7
Signed-off-by: Johnny Lee <johnnlee@google.com>
2021-01-08 15:04:03 +08:00
Wilson Sung
0f7b3b7ae4 Merge branch 'LA.UM.7.8.9.C2.08.00.00.618.110' into qcom-msm-4.9
Change-Id: I56861689cd4141286dfee6a98f00c792c601ed28
2020-10-21 12:16:39 +08:00
Divya Sharma
e2524e090c ANDROID_BUILD_TOP is deprecated
ANDROID_BUILD_TOP variable is deprecated and thus all paths are assumed
to be relative to the top directory. However, this is causing problem
when some of the paths are constructed in the Android build system and
used in the non-Android makefiles that are usually executed NOT at the
top directory but at a sub directory using -C option. As a result, the
relative path from the Android build system become invalid in the
non-Android makefiles.

In order to overcome the restriction, ANDROID_BUILD_TOP is manually
constructed when invoking the non-Android makefiles by using $$(pwd).
The non-Android makefiles are expected to construct the absolute path
by prepending ANDROID_BUILD_TOP to any path that came from the Android
build system.

Change-Id: Ia2e380cf329f56c8d36ad8dbde90d6a655f9509a
Signed-off-by: Divya Sharma <divyash@codeaurora.org>
Signed-off-by: Bruce Levy <blevy@codeaurora.org>
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
Signed-off-by: Shadab Naseem <snaseem@codeaurora.org>
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
2020-06-18 21:02:48 -07:00
Raghavendra Rao Ananta
d5214a547e AndroidKernel: Update the LLVM path
Update the LLVM path due to a change in the compiler version.

Change-Id: I7c6c46047b4bb6f4a9e3d49eec1ae252c42fdbd8
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
2020-06-18 21:02:37 -07:00
Raghavendra Rao Ananta
3a2966cabe AndroidKernel: Add configuration for the LLVM path
Set LLVM path depending on the configuration done by the build system.

Change-Id: Ib4ebf15c17c2febfee44404df0d2582625f11516
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
2020-06-18 21:02:30 -07:00
Prasad Sodagudi
4dbd0f1d87 AndroidKernel: Add LLVM support for Kernel
Add necessary changes to be able to compile the Kernel
with LLVM.
Also update for KERNEL_VM_* specific rules.

Change-Id: I147a7abc29ec66828e9626a74125d391f8aaa329
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
Signed-off-by: Shadab Naseem <snaseem@codeaurora.org>
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
2020-06-14 22:05:26 -07:00
Neeraj Upadhyay
2e9dce914c AndroidKernel: Compile VM kernel in addition to base defconfig
Compile VM kernel defconfig, if specified, in addition to the
base defconfig.

Change-Id: Id40a4304be97144818fe8b71d2991273196903f0
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
2020-06-14 22:05:19 -07:00
Mukesh Ojha
2020183c30 AndroidKernel: Use TARGET_KERNEL_CROSS_COMPILE_PREFIX for both 32/64 bit
TARGET_TOOLS_PREFIX is a new variable introduced in build environment
which keeps the location of the toolchain from the android source, which
was working for 64bit but giving unwind warnings for 32 bit targets.

[    7.353691] VFS: Mounted root (ext4 filesystem) readonly on device 253:0.
[    7.363324] Freeing unused kernel memory: 2048K
[    7.375778] unwind: Unknown symbol address c010130c
[    7.375802] unwind: Index not found c010130c
[    7.379466] unwind: Unknown symbol address c010130c
[    7.383992] unwind: Index not found c010130c
[    7.388578] unwind: Unknown symbol address c010130c
[    7.393096] unwind: Index not found c010130c
[    7.397690] unwind: Unknown symbol address c010130c
[    7.402227] unwind: Index not found c010130c
[    7.406806] unwind: Unknown symbol address c010130c
[    7.411331] unwind: Index not found c010130c

To solve this let's make the toolchain path prefix change in the target
BoardConfig file as per architecture(32/64) basis and avoid making change
in kernel.

Change-Id: I6ca9642aeabbba1b892e169816f3d6d260bd50d5
Signed-off-by: Mukesh Ojha <mojha@codeaurora.org>
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
2020-06-14 22:04:59 -07:00
lucaswei
d744f77f86 Revert "Makefile : Add gcc-broken support for kernel"
This reverts commit f76cc77d25.

Bug: 152284148
Change-Id: I676c90947d5add3bc35929eb04451119858ffac9
Signed-off-by: lucaswei <lucaswei@google.com>
2020-04-15 15:21:42 +08:00
Naitik Bharadiya
f76cc77d25 Makefile : Add gcc-broken support for kernel
As part of gcc removal process, gcc binary will be
rename to gcc-broken to avoid build breakge so use
gcc-broken instead of gcc in kernel.

Change-Id: I6507f2a1607d418097fb2f7975c5ad08f2a5db33
Signed-off-by: Naitik Bharadiya <bharad@codeaurora.org>
2020-03-17 11:12:57 -07:00
Neeraj Upadhyay
34a66bd0b5 AndroidKernel: Explicitly mark certain targets as phony
kerneltags and kernelconfig are phony targets, so mark them
with .PHONY.

Change-Id: I7089d819ff7c64a7b07a0ca5d9de01ec216275b6
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
2019-10-31 03:17:39 -07:00
Mukesh Ojha
39576f8d7e AndroidKernel: Use host machine tools
Use the host directory of tools for kernel cross
compilation to ensure build results are reproducible
across different machines.

Change-Id: I804745bb1962c46e944ba43e77e8876435c9059e
Signed-off-by: Mukesh Ojha <mojha@codeaurora.org>
2018-10-12 20:01:36 +05:30
Puja Gupta
4544540fd2 AndroidKernel: add support to configure DLKM install path
Add support to configure DLKM install path.

TARGET_OUT is hard coded to system directory.
Use PRODUCT_OUT instead of TARGET_OUT to use user configured path
instead.

Change-Id: Iacbfa0fce69d3cb4b6f47a6c857983034633dc19
Signed-off-by: Shashank Mittal <mittals@codeaurora.org>
Signed-off-by: Puja Gupta <pujag@codeaurora.org>
2017-05-03 16:11:07 -07:00
Puja Gupta
e5df4f391a AndroidKernel: add support to pass build flags
Add support to pass build flags while compiling Linux kernel.

This change is required to add support in Linux kernel to use external
host executable. (example: dtc)

Usage example:
TARGET_KERNEL_MAKE_ENV := DTC_EXT=dtc$(HOST_EXECUTABLE_SUFFIX)

Change-Id: I008ca00cf9695133ff167ffdee8d8dfb89beb598
Signed-off-by: Shashank Mittal <mittals@codeaurora.org>
Signed-off-by: Puja Gupta <pujag@codeaurora.org>
2017-04-27 15:59:09 -07:00
Ameya Thakur
300fae9e8c AndroidKernel: Add the makefile required to build Android
The makefile invoked by the Android build system is now added to the
kernel tree.

CRs-Fixed: 2013720
Change-Id: I1613049a68f8f0f8b20979853fbc366d2c955db8
Signed-off-by: Ameya Thakur <ameyat@codeaurora.org>
Signed-off-by: Bhargav Gurappadi <bhargavg1@codeaurora.org>
Signed-off-by: Bruce Levy <blevy@codeaurora.org>
2017-03-02 12:52:26 -08:00