All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bowgo Tsai <bowgotsai@google.com>
To: selinux@tycho.nsa.gov
Cc: bowgotsai <bowgotsai@google.com>,
	Jeffrey Vander Stoep <jeffv@google.com>,
	Daniel Cashman <dcashman@google.com>
Subject: Re: [PATCH 1/2] libsepol, checkpolicy: Update Android.mk
Date: Thu, 22 Sep 2016 16:17:22 -0700	[thread overview]
Message-ID: <CAMFYTWedPzHCoGx=jM6-L1AV8OReLOsvhxSpouLhvfJcCy0YXQ@mail.gmail.com> (raw)
In-Reply-To: <1474573685-124428-1-git-send-email-bowgotsai@google.com>

[-- Attachment #1: Type: text/plain, Size: 3624 bytes --]

+Jeffrey and Daniel

On Thu, Sep 22, 2016 at 12:48 PM, Bowgo Tsai <bowgotsai@google.com> wrote:

> From: bowgotsai <bowgotsai@google.com>
>
> ---
>  checkpolicy/Android.mk | 11 ++---------
>  libsepol/Android.mk    | 16 ++++++++--------
>  2 files changed, 10 insertions(+), 17 deletions(-)
>
> diff --git a/checkpolicy/Android.mk b/checkpolicy/Android.mk
> index 3b7ff8a..ee2f158 100644
> --- a/checkpolicy/Android.mk
> +++ b/checkpolicy/Android.mk
> @@ -18,13 +18,6 @@ common_includes := \
>         $(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)
> @@ -32,7 +25,7 @@ include $(CLEAR_VARS)
>  LOCAL_MODULE := checkpolicy
>  LOCAL_MODULE_TAGS := optional
>  LOCAL_C_INCLUDES := $(common_includes)
> -LOCAL_CFLAGS := $(yacc_flags) $(common_cflags)
> +LOCAL_CFLAGS := $(common_cflags)
>  LOCAL_SRC_FILES := $(common_src_files) checkpolicy.c
>  LOCAL_STATIC_LIBRARIES := libsepol
>  LOCAL_YACCFLAGS := -v
> @@ -49,7 +42,7 @@ include $(CLEAR_VARS)
>  LOCAL_MODULE := checkmodule
>  LOCAL_MODULE_TAGS := optional
>  LOCAL_C_INCLUDES := $(common_includes)
> -LOCAL_CFLAGS := $(yacc_flags) $(common_cflags)
> +LOCAL_CFLAGS := $(common_cflags)
>  LOCAL_SRC_FILES := $(common_src_files) checkmodule.c
>  LOCAL_STATIC_LIBRARIES := libsepol
>  LOCAL_YACCFLAGS := -v
> diff --git a/libsepol/Android.mk b/libsepol/Android.mk
> index 6d89f17..e9cfeef 100644
> --- a/libsepol/Android.mk
> +++ b/libsepol/Android.mk
> @@ -81,6 +81,7 @@ common_includes := \
>  # build system will soon default C++ to -std=c++11.
>  yacc_flags := -x c -std=gnu89
>
> +
>  ##
>  # libsepol.so
>  #
> @@ -88,12 +89,11 @@ 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_CFLAGS := $(common_cflags)
> +LOCAL_CPPFLAGS := $(yacc_flags)
>  LOCAL_SRC_FILES := $(common_src_files) $(cil_src_files)
> -LOCAL_MODULE_CLASS := SHARED_LIBRARIES
> +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
>
>  include $(BUILD_HOST_SHARED_LIBRARY)
>
> @@ -105,9 +105,10 @@ include $(CLEAR_VARS)
>  LOCAL_MODULE := libsepol
>  LOCAL_MODULE_TAGS := optional
>  LOCAL_C_INCLUDES := $(common_includes)
> -LOCAL_CFLAGS := $(yacc_flags) $(common_cflags)
> +LOCAL_CFLAGS := $(common_cflags)
> +LOCAL_CPPFLAGS := $(yacc_flags)
>  LOCAL_SRC_FILES := $(common_src_files) $(cil_src_files)
> -LOCAL_MODULE_CLASS := STATIC_LIBRARIES
> +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
>
>  include $(BUILD_HOST_STATIC_LIBRARY)
>
> @@ -122,7 +123,6 @@ 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)
>
> @@ -133,6 +133,6 @@ LOCAL_MODULE_TAGES := optional
>  LOCAL_C_INCLUDES := $(common_includes)
>  LOCAL_CFLAGS := $(common_cflags)
>  LOCAL_SRC_FILES := $(common_src_files)
> -LOCAL_MODULE_CLASS := STATIC_LIBRARIES
> +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
>
>  include $(BUILD_STATIC_LIBRARY)
> --
> 2.8.0.rc3.226.g39d4020
>
>


-- 

Bowgo Tsai |  Engineer |  bowgotsai@google.com |  +886 (2) 8729-6364
<%2B886287296364>

[-- Attachment #2: Type: text/html, Size: 5717 bytes --]

  reply	other threads:[~2016-09-22 23:17 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-22 19:48 [PATCH 1/2] libsepol, checkpolicy: Update Android.mk Bowgo Tsai
2016-09-22 23:17 ` Bowgo Tsai [this message]
2016-09-26 14:24 ` Stephen Smalley
2016-09-29  2:17   ` Bowgo Tsai
2016-09-29 13:28     ` Stephen Smalley
2016-09-29 14:06       ` William Roberts
2016-10-03 17:27         ` Daniel Cashman
2016-10-04  1:49           ` Bowgo Tsai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAMFYTWedPzHCoGx=jM6-L1AV8OReLOsvhxSpouLhvfJcCy0YXQ@mail.gmail.com' \
    --to=bowgotsai@google.com \
    --cc=dcashman@google.com \
    --cc=jeffv@google.com \
    --cc=selinux@tycho.nsa.gov \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.