From patchwork Mon Oct 17 20:24:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Roberts, William C" X-Patchwork-Id: 9380519 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EB284600CA for ; Mon, 17 Oct 2016 20:29:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFD3228F34 for ; Mon, 17 Oct 2016 20:29:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D46CE28F41; Mon, 17 Oct 2016 20:29:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from emsm-gh1-uea11.nsa.gov (emsm-gh1-uea11.nsa.gov [8.44.101.9]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5444828F34 for ; Mon, 17 Oct 2016 20:29:39 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.31,358,1473120000"; d="scan'208";a="20138069" IronPort-PHdr: =?us-ascii?q?9a23=3AAmkJVxIhXAC3nRUtatmcpTZWNBhigK39O0sv0rFi?= =?us-ascii?q?tYgUI/7xwZ3uMQTl6Ol3ixeRBMOAuqgC1rCd6vuxEUU7or+5+EgYd5JNUxJXwe?= =?us-ascii?q?43pCcHRPC/NEvgMfTxZDY7FskRHHVs/nW8LFQHUJ2mPw6anHS+4HYoFwnlMkIt?= =?us-ascii?q?f6KuS9SU0p78jrvjs7ToICxwzAKnZr1zKBjk5S7wjeIxxbVYF6Aq1xHSqWFJce?= =?us-ascii?q?kFjUlhJFaUggqurpzopM0rzj5U884F24YAFPyiPvdwcbsNFzkiMmYo9OX3pBLD?= =?us-ascii?q?Sk2J/XJaXWII1lJTDgHD4Av9X5u0tirhqsJhySKaOovwVrlyVjO8q+9wRATAlD?= =?us-ascii?q?YMNzl/9nrezMN3kvF1uhWk8gN+x4rVaYTTP7xkeanQZ88BbWtHQstVESdGB9Dv?= =?us-ascii?q?J7ATBvYMaL4L57L2oEED+F7nXQQ=3D?= X-IPAS-Result: =?us-ascii?q?A2GvBgAtNAVY/wHyM5BbGwEBAQMBAQEJAQEBFwEBBAEBCgE?= =?us-ascii?q?BgxEBAQEBAR2BU6Q6gVuUWyeHdEwBAQEBAQEBAQIBAlsngjIEAxMFghECBAECN?= =?us-ascii?q?xQgDgMJAQEXCCEICAMBLRURBwcLBRgEiDHCSgwBJYhChmcCEQGFewWaBpAEAol?= =?us-ascii?q?+hXVJkDJUhVtWAYZRDxdhgSgBAQE?= Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea11.nsa.gov with ESMTP; 17 Oct 2016 20:29:20 +0000 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u9HKTJxD001334; Mon, 17 Oct 2016 16:29:20 -0400 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id u9HKOwOa165482 for ; Mon, 17 Oct 2016 16:24:58 -0400 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u9HKOuRc032743; Mon, 17 Oct 2016 16:24:57 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1DuBQC1MgVY/yNjr8ZbGgEBAQECAQEBAQgBAQEBgzwBAQEBAR2BU6Q6kimEF4Ixg3ECgW1MAQIBAQEBAQJehQkCBHkQIDFXBxKIUsJIAQEBAQEFAiaIQoZnhg8FmgaQBAKPc0mQMlSFWyI0AYZRgi8BAQE X-IPAS-Result: A1DuBQC1MgVY/yNjr8ZbGgEBAQECAQEBAQgBAQEBgzwBAQEBAR2BU6Q6kimEF4Ixg3ECgW1MAQIBAQEBAQJehQkCBHkQIDFXBxKIUsJIAQEBAQEFAiaIQoZnhg8FmgaQBAKPc0mQMlSFWyI0AYZRgi8BAQE X-IronPort-AV: E=Sophos;i="5.31,358,1473134400"; d="scan'208";a="5767609" Received: from emsm-gh1-uea11.corp.nsa.gov (HELO emsm-gh1-uea11.nsa.gov) ([10.208.41.37]) by goalie.tycho.ncsc.mil with ESMTP; 17 Oct 2016 16:24:57 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3AfiFxOBSibBa6yL1uas4Aw3rfONpsv+yvbD5Q0YIu?= =?us-ascii?q?jvd0So/mwa65ZRON2/xhgRfzUJnB7Loc0qyN4vqmBDZLuM3Q+Fk5M7V0Hycfjs?= =?us-ascii?q?sXmwFySOWkMmbcaMDQUiohAc5ZX0Vk9XzoeWJcGcL5ekGA6ibqtW1aJBzzOEJP?= =?us-ascii?q?K/jvHcaK1oLshrr0pseYOl4ZzBOGIppKZC2sqgvQssREyaBDEY0WjiXzn31TZu?= =?us-ascii?q?5NznlpL1/A1zz158O34YIxu38I46Fp34d6XK77Z6U1S6BDRHRjajhtpZ7djh7Z?= =?us-ascii?q?UQaD3HYXU31M2loUW0mWpC39C4z8tir8q/pVxDiRPcqwS6s9Hzul8eMjUxLhji?= =?us-ascii?q?sdMD81tWXWkdBYkLNQoBXnoQd2hYHTfsXdL/ZlVr/MdtMdA2xaV4BeUDISLJm7?= =?us-ascii?q?at4QDu4FPO9d6YK7vVwEoAGiHiGtAv/iznlDgXqljuUBz+09HFSej0QbFNUUvS?= =?us-ascii?q?GR8o34?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0G1BQAxMwVY/yNjr8ZbGgEBAQECAQEBA?= =?us-ascii?q?QgBAQEBFgEBAQMBAQEJAQEBgxEBAQEBAR2BU6Q6gVuQToQXhiICgW1MAQEBAQE?= =?us-ascii?q?BAQECAQJbJ4IyBAEVBYIRAgR5ECAxVwcSiFLCSAEBAQEBBQIBJYhChmeGDwWaB?= =?us-ascii?q?pAEAo9zSZAyVIVbIjQBhlFugUEBAQE?= X-IPAS-Result: =?us-ascii?q?A0G1BQAxMwVY/yNjr8ZbGgEBAQECAQEBAQgBAQEBFgEBAQM?= =?us-ascii?q?BAQEJAQEBgxEBAQEBAR2BU6Q6gVuQToQXhiICgW1MAQEBAQEBAQECAQJbJ4IyB?= =?us-ascii?q?AEVBYIRAgR5ECAxVwcSiFLCSAEBAQEBBQIBJYhChmeGDwWaBpAEAo9zSZAyVIV?= =?us-ascii?q?bIjQBhlFugUEBAQE?= X-IronPort-AV: E=Sophos;i="5.31,358,1473120000"; d="scan'208";a="20137879" Received: from fmsmga002-icc.fm.intel.com ([198.175.99.35]) by emsm-gh1-uea11.nsa.gov with ESMTP; 17 Oct 2016 20:24:54 +0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga002-icc.fm.intel.com with ESMTP; 17 Oct 2016 13:24:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.31,358,1473145200"; d="scan'208"; a="1046007592" Received: from mcohen2-mobl.amr.corp.intel.com (HELO wcrobert-MOBL1.amr.corp.intel.com) ([10.254.186.130]) by orsmga001.jf.intel.com with ESMTP; 17 Oct 2016 13:24:52 -0700 From: william.c.roberts@intel.com To: selinux@tycho.nsa.gov, seandroid-list@tycho.nsa.gov, sds@tycho.nsa.gov Subject: [PATCH 8/8] libselinux: add booleans.c to ANDROID_HOST=y recipe Date: Mon, 17 Oct 2016 16:24:10 -0400 Message-Id: <1476735850-7844-8-git-send-email-william.c.roberts@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476735850-7844-1-git-send-email-william.c.roberts@intel.com> References: <1476735850-7844-1-git-send-email-william.c.roberts@intel.com> X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Virus-Scanned: ClamAV using ClamSMTP From: William Roberts We build booleans.c with DISABLE_BOOL set on Android host and target. Add that file to the upstream Makefile. Signed-off-by: William Roberts --- libselinux/src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile index 7a1ae05..ccd8442 100644 --- a/libselinux/src/Makefile +++ b/libselinux/src/Makefile @@ -100,7 +100,7 @@ DISABLE_FLAGS+= -DNO_MEDIA_BACKEND -DNO_DB_BACKEND -DNO_X_BACKEND \ -DBUILD_HOST SRCS= callbacks.c freecon.c label.c label_file.c \ label_backends_android.c regex.c label_support.c \ - matchpathcon.c setrans_client.c sha1.c + matchpathcon.c setrans_client.c sha1.c booleans.c else DISABLE_FLAGS+= -DNO_ANDROID_BACKEND SRCS:= $(filter-out label_backends_android.c, $(SRCS))