X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=Android.bp;h=46f63348c31eb690a76008ef73114dc559544c41;hb=e14cbaa77483ee857af840750c4b2553b38caaf4;hp=79dd58ea7130e79d69b7394cb5a48e5a7df6c013;hpb=eb5b037f98ae203f1ee0438b8e5413bef1c775de;p=tools%2Fe2fsprogs.git diff --git a/Android.bp b/Android.bp index 79dd58e..46f6334 100644 --- a/Android.bp +++ b/Android.bp @@ -1,19 +1,73 @@ // Copyright 2017 The Android Open Source Project +package { + default_applicable_licenses: ["external_e2fsprogs_license"], +} + +// Added automatically by a large-scale-change that took the approach of +// 'apply every license found to every target'. While this makes sure we respect +// every license restriction, it may not be entirely correct. +// +// e.g. GPL in an MIT project might only apply to the contrib/ directory. +// +// Please consider splitting the single license below into multiple licenses, +// taking care not to lose any license_kind information, and overriding the +// default license using the 'licenses: [...]' property on targets as needed. +// +// For unused files, consider creating a 'fileGroup' with "//visibility:private" +// to attach the license to, and including a comment whether the files may be +// used in the current project. +// See: http://go/android-license-faq +license { + name: "external_e2fsprogs_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-0BSD", + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-GPL", + "SPDX-license-identifier-GPL-2.0", + "SPDX-license-identifier-LGPL", + "SPDX-license-identifier-LGPL-2.0", + "SPDX-license-identifier-LGPL-2.1", + "SPDX-license-identifier-LGPL-3.0", + "SPDX-license-identifier-MIT", + "legacy_notice", + "legacy_unencumbered", + ], + license_text: [ + "NOTICE", + ], +} + cc_defaults { name: "e2fsprogs-defaults", - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + // Some warnings that Android's build system enables by default are not + // supported by upstream e2fsprogs. When such a warning shows up, + // disable it below. Please don't disable warnings that upstream + // e2fsprogs is supposed to support; for those, fix the code instead. + "-Wno-pointer-arith", + "-Wno-sign-compare", + "-Wno-type-limits", + "-Wno-typedef-redefinition", + "-Wno-unused-parameter", + ], target: { + bionic: { + system_shared_libs: [ + "libc", + "libdl", + ], + }, darwin: { - // Still has unfixed/unsuppressed warnings. - cflags: ["-Wno-error"], + // This matches what the upstream CI uses + cflags: ["-Wno-error=deprecated-declarations"], }, windows: { - cflags: [ - "-Wno-typedef-redefinition", - "-Wno-unused-parameter", - "-Wno-unused-variable", - ], + include_dirs: ["external/e2fsprogs/include/mingw"], }, }, }