commit 1584c26e1defa0565470c57a66a6644fd115f9f7
author Florian Mayer <fmayer@google.com> Fri Mar 05 13:11:22 2021 +0000
committer Florian Mayer <fmayer@google.com> Fri Mar 05 13:11:22 2021 +0000
tree 56df9bb581c5be64e295fcd93b735806f29d4106
parent c288a8f04c2df523b176c3cdcb5ea8fd960ef834

Add license { ... } properly to Android.bp gen.

See https://r.android.com/1588625

Change-Id: I13b3cd7d29ad419eb9b9fc917619f1379bff01bd

Android.bp

diff --git a/Android.bp b/Android.bp
index de08d3a..40002a0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,37 +15,6 @@
 // This file is automatically generated by tools/gen_android_bp. Do not edit.
 
 // GN: //src/profiling/memory:heapprofd
-package {
-    default_applicable_licenses: ["external_perfetto_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_perfetto_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-BSD",
-        "SPDX-license-identifier-CC-BY",
-    ],
-    license_text: [
-        "LICENSE",
-    ],
-}
-
 cc_binary {
   name: "heapprofd",
   srcs: [
@@ -9800,3 +9769,34 @@
         "statslog_perfetto.cpp",
     ],
 }
+
+package {
+    default_applicable_licenses: ["external_perfetto_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_perfetto_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-CC-BY",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}