Narayan Kamath 1d755aaa7b resolved conflicts for merge of 6835cbf9 to master ... Change-Id: I21593edf5f597bc79ff91b756bdaf6921b05cba7		2013-12-06 17:31:38 +00:00
..
arch	am 09c6d68b: am 816af5fc: Merge "Specify -mcpu=cortex-a15 for krait CPU variants."	2013-10-11 17:35:09 -07:00
include/arch	am e9966aab: am 79a9a324: am 3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."	2013-11-08 13:42:20 -08:00
HOST_darwin-x86.mk	Don't try to group static libraries on mac.	2013-03-11 14:59:42 +00:00
HOST_linux-x86.mk	am e2f7bd46: am c148cca6: Merge "Specify -msse3 on host as on target."	2013-02-27 19:03:54 +00:00
HOST_windows-x86.mk	Added BUILD_HOST_static to build statically linked executable/shared-lib	2012-08-21 14:40:16 +08:00
javac.mk	A few more Java7 related clean ups.	2013-12-05 13:23:06 +00:00
select.mk	Run ar in Deterministic mode.	2013-12-02 14:15:23 -08:00
TARGET_linux-aarch64.mk	AArch64: Enable AArch64 support	2013-10-29 16:15:40 -07:00
TARGET_linux-arm.mk	am 3b54d5a5: am a5b55c27: Merge "Add a "reverse AUX hack" for ARM."	2013-11-25 13:50:26 -08:00
TARGET_linux-mips.mk	Switch MIPS over to uapi-only.	2013-11-25 14:01:10 -08:00
TARGET_linux-x86.mk	Switch x86 over to uapi-only.	2013-11-25 16:38:47 -08:00
TARGET_linux-x86_64.mk	Merge "Cleanup x86 and x86_64 flags"	2013-11-14 04:54:55 +00:00