Merge "Add NATIVE_TESTS class, move host native tests"

author Dan Willemsen <dwillemsen@google.com>

Mon, 6 Jun 2016 23:59:23 +0000 (23:59 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Mon, 6 Jun 2016 23:59:23 +0000 (23:59 +0000)
author Dan Willemsen <dwillemsen@google.com>
Mon, 6 Jun 2016 23:59:23 +0000 (23:59 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 6 Jun 2016 23:59:23 +0000 (23:59 +0000)
diff --cc core/base_rules.mk
Simple merge
diff --cc core/binary.mk
Simple merge
diff --cc core/combo/HOST_darwin-x86.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
diff --cc core/envsetup.mk
Simple merge
diff --cc core/main.mk
Simple merge
diff --cc core/prebuilt.mk
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Mon, 6 Jun 2016 23:59:23 +0000 (23:59 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 6 Jun 2016 23:59:23 +0000 (23:59 +0000)
		1	2
core/base_rules.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/combo/HOST_darwin-x86.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/envsetup.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/main.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/prebuilt.mk	patch \|	diff1 \|	diff2 \|	blob \| history