X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=Android.bp;h=e596664bfbd27c38421d09724f496eb7660fcb23;hb=8d66e7e9316002ca9f9d558069bd56ccba9cece8;hp=79dd58ea7130e79d69b7394cb5a48e5a7df6c013;hpb=eb5b037f98ae203f1ee0438b8e5413bef1c775de;p=tools%2Fe2fsprogs.git

diff --git a/Android.bp b/Android.bp
index 79dd58e..e596664 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,48 @@
 // 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", "-Wno-pointer-arith"],
     target: {
         darwin: {
             // Still has unfixed/unsuppressed warnings.
@@ -15,6 +55,9 @@ cc_defaults {
                 "-Wno-unused-variable",
             ],
         },
+        bionic: {
+            system_shared_libs: ["libc", "libdl"],
+        },
     },
 }