| Message ID | 1474573685-124428-1-git-send-email-bowgotsai@google.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
+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 > >
On 09/22/2016 03:48 PM, Bowgo Tsai wrote: > From: bowgotsai <bowgotsai@google.com> It looks to me as if the final versions of these patches changed before they were committed to AOSP, so I'm going to ignore these and assume you'll submit new ones. Also, if updating these, shouldn't you also update the top-level selinux/Android.mk file as well? I was wondering however if it makes sense to keep these files upstream or if we should just drop them and let them only exist in the Android tree. > > --- > 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) >
OK, please ignore these patches, will update new ones. I'll update the top-level Android.mk if we still want to keep Android.mk upstream. However, I was thinking the same thing: it seems better to only keep Android.mk files in Android tree. For other *.c/*.h files, keep these files up-to-date in the upstream as well. If no one objects to this, I'll prepare two patches. 1. Update secilc/secilc.c 2. Delete all Android.mk files in the upstream Let me know your thoughts. Thanks, On Mon, Sep 26, 2016 at 10:24 PM, Stephen Smalley <sds@tycho.nsa.gov> wrote: > On 09/22/2016 03:48 PM, Bowgo Tsai wrote: > > From: bowgotsai <bowgotsai@google.com> > > It looks to me as if the final versions of these patches changed before > they were committed to AOSP, so I'm going to ignore these and assume > you'll submit new ones. Also, if updating these, shouldn't you also > update the top-level selinux/Android.mk file as well? > > I was wondering however if it makes sense to keep these files upstream > or if we should just drop them and let them only exist in the Android tree. > > > > > --- > > 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) > > > >
On 09/28/2016 10:17 PM, Bowgo Tsai wrote: > OK, please ignore these patches, will update new ones. > I'll update the top-level Android.mk if we still want to keep Android.mk > upstream. > > However, I was thinking the same thing: it seems better to only keep > Android.mk files in Android tree. > For other *.c/*.h files, keep these files up-to-date in the upstream as > well. > > If no one objects to this, I'll prepare two patches. > > 1. Update secilc/secilc.c > 2. Delete all Android.mk files in the upstream SGTM
On Thu, Sep 29, 2016 at 9:28 AM, Stephen Smalley <sds@tycho.nsa.gov> wrote: > On 09/28/2016 10:17 PM, Bowgo Tsai wrote: >> OK, please ignore these patches, will update new ones. >> I'll update the top-level Android.mk if we still want to keep Android.mk >> upstream. >> >> However, I was thinking the same thing: it seems better to only keep >> Android.mk files in Android tree. >> For other *.c/*.h files, keep these files up-to-date in the upstream as >> well. >> >> If no one objects to this, I'll prepare two patches. >> >> 1. Update secilc/secilc.c >> 2. Delete all Android.mk files in the upstream > > SGTM SGTM
+1 SGTM. On Thu, Sep 29, 2016 at 7:06 AM William Roberts <bill.c.roberts@gmail.com> wrote: > On Thu, Sep 29, 2016 at 9:28 AM, Stephen Smalley <sds@tycho.nsa.gov> > wrote: > > On 09/28/2016 10:17 PM, Bowgo Tsai wrote: > >> OK, please ignore these patches, will update new ones. > >> I'll update the top-level Android.mk if we still want to keep Android.mk > >> upstream. > >> > >> However, I was thinking the same thing: it seems better to only keep > >> Android.mk files in Android tree. > >> For other *.c/*.h files, keep these files up-to-date in the upstream as > >> well. > >> > >> If no one objects to this, I'll prepare two patches. > >> > >> 1. Update secilc/secilc.c > >> 2. Delete all Android.mk files in the upstream > > > > SGTM > > SGTM >
Thanks for the confirmation, both changes were merged into upstream. On Tue, Oct 4, 2016 at 1:27 AM, Daniel Cashman <dcashman@google.com> wrote: > +1 SGTM. > > On Thu, Sep 29, 2016 at 7:06 AM William Roberts <bill.c.roberts@gmail.com> > wrote: > >> On Thu, Sep 29, 2016 at 9:28 AM, Stephen Smalley <sds@tycho.nsa.gov> >> wrote: >> > On 09/28/2016 10:17 PM, Bowgo Tsai wrote: >> >> OK, please ignore these patches, will update new ones. >> >> I'll update the top-level Android.mk if we still want to keep >> Android.mk >> >> upstream. >> >> >> >> However, I was thinking the same thing: it seems better to only keep >> >> Android.mk files in Android tree. >> >> For other *.c/*.h files, keep these files up-to-date in the upstream as >> >> well. >> >> >> >> If no one objects to this, I'll prepare two patches. >> >> >> >> 1. Update secilc/secilc.c >> >> 2. Delete all Android.mk files in the upstream >> > >> > SGTM >> >> SGTM >> >
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)
From: bowgotsai <bowgotsai@google.com> --- checkpolicy/Android.mk | 11 ++--------- libsepol/Android.mk | 16 ++++++++-------- 2 files changed, 10 insertions(+), 17 deletions(-)