From patchwork Fri Sep 30 03:17:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bowgo Tsai X-Patchwork-Id: 9358159 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 5262F600C8 for ; Fri, 30 Sep 2016 12:26:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4158F299C4 for ; Fri, 30 Sep 2016 12:26:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35F4229FF4; Fri, 30 Sep 2016 12:26:15 +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=-1.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from emsm-gh1-uea10.nsa.gov (emsm-gh1-uea10.nsa.gov [8.44.101.8]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D850299C4 for ; Fri, 30 Sep 2016 12:26:14 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.31,272,1473120000"; d="scan'208";a="18140942" IronPort-PHdr: =?us-ascii?q?9a23=3ARuE0wBFQcQC0slEW98RPH51GYnF86YWxBRYc798d?= =?us-ascii?q?s5kLTJ75o8uwAkXT6L1XgUPTWs2DsrQf2rCQ6fmrBTxIyK3CmUhKSIZLWR4BhJ?= =?us-ascii?q?detC0bK+nBN3fGKuX3ZTcxBsVIWQwt1Xi6NU9IBJS2PAWK8TWM5DIfUi/yKRBy?= =?us-ascii?q?brysXNWD1YLtjqvuq9X6WEZhvHKFe7R8LRG7/036l/I9ps9cEJs30QbDuXBSeu?= =?us-ascii?q?5blitCLFOXmAvgtI/rpMYwuxlKv7od0+IIEeCjJ+VrBYBfWS8rN2Ez+d3DqQjI?= =?us-ascii?q?TQzJ4GAVFGoRjElmGQ/AuTv9QZj2+hfhv+s1jCOdIsLxUas9WByt6KBkTBKugy?= =?us-ascii?q?ACYW1quFrLg9B92foI6CmqoAZylsuNOIw=3D?= X-IPAS-Result: =?us-ascii?q?A2GsBAD1WO5X/wHyM5BdGwEBAQMBAQEJAQEBFwEBBAEBCgE?= =?us-ascii?q?BgxQBAQEBAR5XfLBPiSwFGDogC4Fwg0BAgXBMAQEBAQEBAQECAQJbJ4IyBAMTB?= =?us-ascii?q?QQBIgEWCzABAQEBAQEBAQEBIAINIhUqAQQCDygGAQEMIAsBAgMJAhcIIQgIAwE?= =?us-ascii?q?tAwEFAQsfCwUYBAGIKw6jY4EyPjKKVoUwAQEFiBoBCgEBAQEBGQgQhBeCEIhrE?= =?us-ascii?q?QGFXR2IPIZ1ikyEWYFOiUoCgjqHHiWFcQKPKjGBEVQlgmqCB2WFRniBKAEBAQ?= Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea10.nsa.gov with ESMTP; 30 Sep 2016 12:26:10 +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 u8UCQApg012706; Fri, 30 Sep 2016 08:26:10 -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 u8U3Htja021183 for ; Thu, 29 Sep 2016 23:17:55 -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 u8U3Hs3P025723 for ; Thu, 29 Sep 2016 23:17:54 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1AQAAAJ2O1XhjbcVdFdHAYMg0EBAQEBAXV8sFCFdYM3BVkkhTBKgWtMAQIBAQEBAQITAQEBCAsLCRmFEwEVLgEBNwEvZQEFATUiiCsOozWBMj4yilaFMAEBBYgfAQEBBwIBHAgQhBeCEItlC4JqHYg8hnWKTIRZgU6JSQKCOocehhQCjygxgRF5gwmBaDE0hnMBAQE X-IPAS-Result: A1AQAAAJ2O1XhjbcVdFdHAYMg0EBAQEBAXV8sFCFdYM3BVkkhTBKgWtMAQIBAQEBAQITAQEBCAsLCRmFEwEVLgEBNwEvZQEFATUiiCsOozWBMj4yilaFMAEBBYgfAQEBBwIBHAgQhBeCEItlC4JqHYg8hnWKTIRZgU6JSQKCOocehhQCjygxgRF5gwmBaDE0hnMBAQE X-IronPort-AV: E=Sophos;i="5.31,418,1473134400"; d="scan'208";a="5737748" 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; 29 Sep 2016 23:17:48 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3Ab3yUMhEuQCXbbFwqdPfig51GYnF86YWxBRYc798d?= =?us-ascii?q?s5kLTJ75pM6wAkXT6L1XgUPTWs2DsrQf2rCQ6firBz1IyK3CmUhKSIZLWR4BhJ?= =?us-ascii?q?detC0bK+nBN3fGKuX3ZTcxBsVIWQwt1Xi6NU9IBJS2PAWK8TWM5DIfUi/yKRBy?= =?us-ascii?q?brysXNWD1YLtj6vsqtX6WEZhvHKFe7R8LRG7/036l/I9ps9cEJs30QbDuXBSeu?= =?us-ascii?q?5blitCLFOXmAvgtI/rpMYwu3cYh/V07MNEUKPnb4wkXLdYC3IgKGlz68r15jfZ?= =?us-ascii?q?Sg7azHwDXWJergFBAkCR5hblUZDtqSL7nuV63yaeMIv9SrViCmfq1LtiVBK90H?= =?us-ascii?q?RPDDU+6myC0sE=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0H0AQBN2O1XhjbcVdFdHAYMGgEFAQsBg?= =?us-ascii?q?xQBAQEBAXV8sFCFdYM3BRhBJIFwg0BKgWtMAQEBAQEBAQECAQIQAQEBCAsLCRk?= =?us-ascii?q?vgjIYCwEiARYLMAEBAQEBAQEBAQEgAg0iFSoBFS4BATcBL2UBBQE1IogrDqM2g?= =?us-ascii?q?TI+MopWhTABAQWIHwEBAQcBAQEBARoIEIQXghCLZQuCah2IPIZ1ikyEWYFOiUk?= =?us-ascii?q?CgjqHHoYUAo8oMYEReYMJgWgxNIZzAQEB?= X-IPAS-Result: =?us-ascii?q?A0H0AQBN2O1XhjbcVdFdHAYMGgEFAQsBgxQBAQEBAXV8sFC?= =?us-ascii?q?FdYM3BRhBJIFwg0BKgWtMAQEBAQEBAQECAQIQAQEBCAsLCRkvgjIYCwEiARYLM?= =?us-ascii?q?AEBAQEBAQEBAQEgAg0iFSoBFS4BATcBL2UBBQE1IogrDqM2gTI+MopWhTABAQW?= =?us-ascii?q?IHwEBAQcBAQEBARoIEIQXghCLZQuCah2IPIZ1ikyEWYFOiUkCgjqHHoYUAo8oM?= =?us-ascii?q?YEReYMJgWgxNIZzAQEB?= X-IronPort-AV: E=Sophos;i="5.31,418,1473120000"; d="scan'208";a="19687962" Received: from mail-pa0-f54.google.com ([209.85.220.54]) by emsm-gh1-uea11.nsa.gov with ESMTP/TLS/AES128-GCM-SHA256; 30 Sep 2016 03:17:47 +0000 Received: by mail-pa0-f54.google.com with SMTP id dw4so20099272pac.1 for ; Thu, 29 Sep 2016 20:17:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=+YS/TQocGuxslNc2XxNbLKYnmWoyL2spym7Hh3A9brw=; b=NxLG0JbK9TubXDj2VYI50Ru6fSeyNtWBtNSvxFRalb0+M/8KMnCY6+YR8GB3fNm1bn V3kch2e4T+kbFYLoL0g4PqfDsotS+IDkOq4PxZPJ0OzqIgGzYt6F5Q3FVsg9kHg4b/0K o4GEOOnqbfGxpVWDXs7jzon2W1vVv2UEu77o33gs+eiaaUE41gMKoFpO7Zs0BQssp3OD vNAS6C9rYrdaUNvXOnAOJP3lrltTX9S4wKSCRazEV3nmQb1DJNe+7jcXTyZfCVZ0Qv86 PEQVhIJdZMapfOjJ5KlxW4rqtO76I1C2EJtvfFIxInTKMgF+GXdsgeuNMhNiApaLKfdF 5aQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+YS/TQocGuxslNc2XxNbLKYnmWoyL2spym7Hh3A9brw=; b=MLZHRXAJ3jyUJqf0vr5rTjeLyPUau+jiOMWtriS6Kd3bbE+zaF3+rC0ak8PxtsRq1U wd58MYBbSUbmgO9BnbHWX6qCEMy2fn2rDRb5TFjbAXyYygGuhpmhkosh8RAE+fvrjP15 h4/bFiX0XxCkcrCN2NiAsKWgUReGhKAiPQmDZwtF0GvagZQl9UUfhfUcwN8xAOt6LuOO yh7yh4nijjNqPYGJAfaS9C2otF8M59SRJB+vmMuQeWhfltb8jab2rlEOqQOGN6jBOFrV KA5dHhYgX/obmV77FdzGzBTelPeQXJlrf6oTkWp09CnSnE1dmRJwduokWveYN5Tz6DCR /Gvw== X-Gm-Message-State: AA6/9RmIYZQyxGrGRub0cI+lD0E3wgTJjYLiq+2PILTRRfpg+TVs+hjpIfJB9UDMErJJahTx X-Received: by 10.66.228.226 with SMTP id sl2mr7818660pac.131.1475205466383; Thu, 29 Sep 2016 20:17:46 -0700 (PDT) Received: from bowgotsai-z840.tpe.corp.google.com ([172.30.210.152]) by smtp.gmail.com with ESMTPSA id 84sm7729438pfu.83.2016.09.29.20.17.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Sep 2016 20:17:45 -0700 (PDT) From: Bowgo Tsai To: selinux@tycho.nsa.gov Subject: [PATCH] Remove Android.mk files and only keep them in Android tree Date: Fri, 30 Sep 2016 11:17:40 +0800 Message-Id: <1475205460-146158-1-git-send-email-bowgotsai@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 X-Mailman-Approved-At: Fri, 30 Sep 2016 08:22:44 -0400 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: Cc: bowgotsai MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Virus-Scanned: ClamAV using ClamSMTP From: bowgotsai The corresponding repository in Android tree: https://android.googlesource.com/platform/external/selinux/ --- Android.mk | 2 - checkpolicy/Android.mk | 73 -------------------------- libsepol/Android.mk | 138 ------------------------------------------------- secilc/Android.mk | 26 ---------- 4 files changed, 239 deletions(-) delete mode 100644 Android.mk delete mode 100644 checkpolicy/Android.mk delete mode 100644 libsepol/Android.mk delete mode 100644 secilc/Android.mk diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 02f35a9..0000000 --- a/Android.mk +++ /dev/null @@ -1,2 +0,0 @@ -# This empty Android.mk file will prevent the build system -# from building anything below this point. diff --git a/checkpolicy/Android.mk b/checkpolicy/Android.mk deleted file mode 100644 index 3b7ff8a..0000000 --- a/checkpolicy/Android.mk +++ /dev/null @@ -1,73 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -common_src_files := \ - policy_parse.y \ - policy_scan.l \ - queue.c \ - module_compiler.c \ - parse_util.c \ - policy_define.c - -common_cflags := \ - -Wall -Wshadow -O2 \ - -pipe -fno-strict-aliasing \ - -common_includes := \ - $(LOCAL_PATH)/ \ - $(LOCAL_PATH)/../libsepol/include/ \ - $(LOCAL_PATH)/../libsepol/src/ \ - -## -# "-x c" forces the lex/yacc files to be compiled as c the build system -# otherwise forces them to be c++. Need to also add an explicit -std because the -# build system will soon default C++ to -std=c++11. -yacc_flags := -x c -std=gnu89 - - -## -# checkpolicy -# -include $(CLEAR_VARS) - -LOCAL_MODULE := checkpolicy -LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) -LOCAL_CFLAGS := $(yacc_flags) $(common_cflags) -LOCAL_SRC_FILES := $(common_src_files) checkpolicy.c -LOCAL_STATIC_LIBRARIES := libsepol -LOCAL_YACCFLAGS := -v -LOCAL_MODULE_CLASS := EXECUTABLES - -include $(BUILD_HOST_EXECUTABLE) - - -## -# checkmodule -# -include $(CLEAR_VARS) - -LOCAL_MODULE := checkmodule -LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) -LOCAL_CFLAGS := $(yacc_flags) $(common_cflags) -LOCAL_SRC_FILES := $(common_src_files) checkmodule.c -LOCAL_STATIC_LIBRARIES := libsepol -LOCAL_YACCFLAGS := -v -LOCAL_MODULE_CLASS := EXECUTABLES - -include $(BUILD_HOST_EXECUTABLE) - -## -# dispol -# -include $(CLEAR_VARS) - -LOCAL_MODULE := dispol -LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) -LOCAL_CFLAGS := $(common_cflags) -LOCAL_SRC_FILES := test/dispol.c -LOCAL_STATIC_LIBRARIES := libsepol -LOCAL_MODULE_CLASS := EXECUTABLES - -include $(BUILD_HOST_EXECUTABLE) diff --git a/libsepol/Android.mk b/libsepol/Android.mk deleted file mode 100644 index 6d89f17..0000000 --- a/libsepol/Android.mk +++ /dev/null @@ -1,138 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -common_src_files := \ - src/assertion.c \ - src/avrule_block.c \ - src/avtab.c \ - src/boolean_record.c \ - src/booleans.c \ - src/conditional.c \ - src/constraint.c \ - src/context.c \ - src/context_record.c \ - src/debug.c \ - src/ebitmap.c \ - src/expand.c \ - src/genbools.c \ - src/genusers.c \ - src/handle.c \ - src/hashtab.c \ - src/hierarchy.c \ - src/iface_record.c \ - src/interfaces.c \ - src/link.c \ - src/mls.c \ - src/module.c \ - src/module_to_cil.c \ - src/node_record.c \ - src/nodes.c \ - src/polcaps.c \ - src/policydb.c \ - src/policydb_convert.c \ - src/policydb_public.c \ - src/port_record.c \ - src/ports.c \ - src/roles.c \ - src/services.c \ - src/sidtab.c \ - src/symtab.c \ - src/user_record.c \ - src/users.c \ - src/util.c \ - src/write.c - -cil_src_files := \ - cil/src/cil_binary.c \ - cil/src/cil_build_ast.c \ - cil/src/cil.c \ - cil/src/cil_copy_ast.c \ - cil/src/cil_find.c \ - cil/src/cil_fqn.c \ - cil/src/cil_lexer.l \ - cil/src/cil_list.c \ - cil/src/cil_log.c \ - cil/src/cil_mem.c \ - cil/src/cil_parser.c \ - cil/src/cil_policy.c \ - cil/src/cil_post.c \ - cil/src/cil_reset_ast.c \ - cil/src/cil_resolve_ast.c \ - cil/src/cil_stack.c \ - cil/src/cil_strpool.c \ - cil/src/cil_symtab.c \ - cil/src/cil_tree.c \ - cil/src/cil_verify.c - -common_cflags := \ - -D_GNU_SOURCE \ - -Wall -W -Wundef \ - -Wshadow -Wmissing-noreturn \ - -Wmissing-format-attribute - -common_includes := \ - $(LOCAL_PATH)/include/ \ - $(LOCAL_PATH)/src/ \ - $(LOCAL_PATH)/cil/include/ \ - $(LOCAL_PATH)/cil/src/ \ - -## -# "-x c" forces the lex/yacc files to be compiled as c the build system -# otherwise forces them to be c++. Need to also add an explicit -std because the -# build system will soon default C++ to -std=c++11. -yacc_flags := -x c -std=gnu89 - -## -# libsepol.so -# -include $(CLEAR_VARS) - -LOCAL_MODULE := libsepol -LOCAL_MODULE_TAGS := optional -LOCAL_COPY_HEADERS_TO := sepol -LOCAL_COPY_HEADERS := include/sepol/handle.h include/sepol/policydb.h cil/include/cil/cil.h -LOCAL_C_INCLUDES := $(common_includes) -LOCAL_CFLAGS := $(yacc_flags) $(common_cflags) -LOCAL_SRC_FILES := $(common_src_files) $(cil_src_files) -LOCAL_MODULE_CLASS := SHARED_LIBRARIES - -include $(BUILD_HOST_SHARED_LIBRARY) - -## -# libsepol.a -# -include $(CLEAR_VARS) - -LOCAL_MODULE := libsepol -LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) -LOCAL_CFLAGS := $(yacc_flags) $(common_cflags) -LOCAL_SRC_FILES := $(common_src_files) $(cil_src_files) -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -include $(BUILD_HOST_STATIC_LIBRARY) - -## -# chkcon -# -include $(CLEAR_VARS) - -LOCAL_MODULE := chkcon -LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) -LOCAL_CFLAGS := $(common_cflags) -LOCAL_SRC_FILES := utils/chkcon.c -LOCAL_SHARED_LIBRARIES := libsepol -LOCAL_MODULE_CLASS := EXECUTABLES - -include $(BUILD_HOST_EXECUTABLE) - -include $(CLEAR_VARS) - -LOCAL_MODULE := libsepol -LOCAL_MODULE_TAGES := optional -LOCAL_C_INCLUDES := $(common_includes) -LOCAL_CFLAGS := $(common_cflags) -LOCAL_SRC_FILES := $(common_src_files) -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -include $(BUILD_STATIC_LIBRARY) diff --git a/secilc/Android.mk b/secilc/Android.mk deleted file mode 100644 index 6c7b9d3..0000000 --- a/secilc/Android.mk +++ /dev/null @@ -1,26 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -common_src_files := secilc.c - -common_cflags := \ - -Wall -Wshadow -O2 \ - -pipe -fno-strict-aliasing \ - -common_includes := \ - $(LOCAL_PATH)/../libsepol/cil/include/ \ - $(LOCAL_PATH)/../libsepol/include/ \ - -## -# secilc -# -include $(CLEAR_VARS) - -LOCAL_MODULE := secilc -LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) -LOCAL_CFLAGS := $(common_cflags) -LOCAL_SRC_FILES := secilc.c -LOCAL_SHARED_LIBRARIES := libsepol -LOCAL_MODULE_CLASS := EXECUTABLES - -include $(BUILD_HOST_EXECUTABLE)