idmap2: improve Android.bp

Improve Android.bp in a few ways:

  - add cc_defaults
  - remove the tidy_flag "-warnings-as-errors=*"

A note on warnings-as-errors: the default set of tidy checks are
inherited from the lists in build/soong/cc/config/tidy.go. This set is
modified by the local Android.bp's tidy_checks. If a new check is
enabled as default, and idmap2 specifies warnings-as-errors, idmap2 will
potentially break the build. In light of this, keep warnings as
warnings.

Also add a few non-default tidy checks. This version of idmap2 doesn't
compile cleanly: fixes will come in future CLs.

Also exempt the auto-generated code from IIdmap2.aidl from clang-tidy by
containing it in a separate cc_library_static block.

Bug: 120024673
Test: mmm frameworks/base/cmds/idmap2
Change-Id: I589fce792075a44a77b79117aa16b63ef0bec142
This commit is contained in:
Mårten Kongstad
2018-11-19 08:26:16 +01:00
committed by Todd Kennedy
parent 222a0f4e21
commit 3c9bc617ca

View File

@@ -12,14 +12,26 @@
// See the License for the specific language governing permissions and
// limitations under the License.
cc_library {
name: "libidmap2",
host_supported: true,
cc_defaults {
name: "idmap2_defaults",
tidy: true,
tidy_checks: [
"android-*",
"misc-*",
"modernize-*",
"readability-*",
],
tidy_flags: [
"-system-headers",
// b/120024673 "-warnings-as-errors=*",
],
}
cc_library {
name: "libidmap2",
defaults: [
"idmap2_defaults",
],
host_supported: true,
srcs: [
"libidmap2/BinaryStreamVisitor.cpp",
"libidmap2/CommandLineOptions.cpp",
@@ -60,12 +72,13 @@ cc_library {
cc_test {
name: "idmap2_tests",
host_supported: true,
tidy: true,
tidy_flags: [
"-system-headers",
// b/120024673 "-warnings-as-errors=*",
defaults: [
"idmap2_defaults",
],
tidy_checks: [
"-readability-magic-numbers",
],
host_supported: true,
srcs: [
"tests/BinaryStreamVisitorTests.cpp",
"tests/CommandLineOptionsTests.cpp",
@@ -114,12 +127,10 @@ cc_test {
cc_binary {
name: "idmap2",
host_supported: true,
tidy: true,
tidy_flags: [
"-system-headers",
// b/120024673 "-warnings-as-errors=*",
defaults: [
"idmap2_defaults",
],
host_supported: true,
srcs: [
"idmap2/Create.cpp",
"idmap2/Dump.cpp",
@@ -156,19 +167,11 @@ cc_binary {
cc_binary {
name: "idmap2d",
defaults: [
"idmap2_defaults",
],
host_supported: false,
tidy: true,
tidy_checks: [
// remove google-default-arguments or clang-tidy will complain about
// the auto-generated file IIdmap2.cpp
"-google-default-arguments",
],
tidy_flags: [
"-system-headers",
// b/120024673 "-warnings-as-errors=*",
],
srcs: [
":idmap2_aidl",
"idmap2d/Idmap2Service.cpp",
"idmap2d/Main.cpp",
],
@@ -181,9 +184,30 @@ cc_binary {
"libutils",
"libziparchive",
],
static_libs: [
"libidmap2daidl",
],
init_rc: ["idmap2d/idmap2d.rc"],
}
cc_library_static {
name: "libidmap2daidl",
defaults: [
"idmap2_defaults",
],
tidy: false,
host_supported: false,
srcs: [
":idmap2_aidl",
],
shared_libs: [
"libbase",
],
aidl: {
export_aidl_headers: true,
},
}
filegroup {
name: "idmap2_aidl",
srcs: [