Skip to content

Commit 02040de

Browse files
committed
Add LOCAL_LICENSE_KINDS to build/soong
Added SPDX-license-identifier-Apache-2.0 to: Android.bp android/Android.bp android/soongconfig/Android.bp androidmk/Android.bp apex/Android.bp bazel/Android.bp bp2build/Android.bp bpf/Android.bp bpfix/Android.bp cc/Android.bp cc/config/Android.bp cc/libbuildversion/Android.bp cc/libbuildversion/tests/Android.bp cc/ndk_api_coverage_parser/Android.bp cc/ndkstubgen/Android.bp cc/symbolfile/Android.bp cmd/dep_fixer/Android.bp cmd/diff_target_files/Android.bp cmd/extract_apks/Android.bp cmd/extract_jar_packages/Android.bp cmd/extract_linker/Android.bp cmd/fileslist/Android.bp cmd/host_bionic_inject/Android.bp cmd/javac_wrapper/Android.bp cmd/merge_zips/Android.bp cmd/multiproduct_kati/Android.bp cmd/path_interposer/Android.bp cmd/pom2bp/Android.bp cmd/pom2mk/Android.bp cmd/sbox/Android.bp cmd/soong_build/Android.bp cmd/soong_env/Android.bp cmd/soong_ui/Android.bp cmd/zip2zip/Android.bp cmd/zipsync/Android.bp cuj/Android.bp dexpreopt/Android.bp dexpreopt/dexpreopt_gen/Android.bp env/Android.bp etc/Android.bp filesystem/Android.bp finder/Android.bp finder/cmd/Android.bp genrule/Android.bp jar/Android.bp java/Android.bp java/config/Android.bp kernel/Android.bp linkerconfig/Android.bp linkerconfig/proto/Android.bp makedeps/Android.bp partner/Android.bp phony/Android.bp python/Android.bp python/tests/Android.bp remoteexec/Android.bp rust/Android.bp rust/config/Android.bp scripts/Android.bp sdk/Android.bp sh/Android.bp shared/Android.bp symbol_inject/Android.bp symbol_inject/cmd/Android.bp sysprop/Android.bp tradefed/Android.bp ui/build/Android.bp ui/logger/Android.bp ui/metrics/Android.bp ui/metrics/proc/Android.bp ui/status/Android.bp ui/terminal/Android.bp ui/tracer/Android.bp xml/Android.bp zip/Android.bp zip/cmd/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: finder/fs/Android.bp third_party/zip/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ia47ca14f16b8c9f84f9d533a07e5b00e2c04e8d4
1 parent 7a10530 commit 02040de

File tree

80 files changed

+390
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+390
-0
lines changed

Diff for: Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
subdirs = [
26
"androidmk",
37
"bpfix",

Diff for: android/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
bootstrap_go_package {
26
name: "soong-android",
37
pkgPath: "android/soong/android",

Diff for: android/soongconfig/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
bootstrap_go_package {
26
name: "soong-android-soongconfig",
37
pkgPath: "android/soong/android/soongconfig",

Diff for: androidmk/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
// androidmk Android.mk to Blueprints translator
1717
//
1818

19+
package {
20+
default_applicable_licenses: ["Android-Apache-2.0"],
21+
}
22+
1923
blueprint_go_binary {
2024
name: "androidmk",
2125
srcs: [

Diff for: apex/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
bootstrap_go_package {
26
name: "soong-apex",
37
pkgPath: "android/soong/apex",

Diff for: bazel/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
bootstrap_go_package {
26
name: "soong-bazel",
37
pkgPath: "android/soong/bazel",

Diff for: bp2build/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
bootstrap_go_package {
26
name: "soong-bp2build",
37
pkgPath: "android/soong/bp2build",

Diff for: bpf/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
// limitations under the License.
1515
//
1616

17+
package {
18+
default_applicable_licenses: ["Android-Apache-2.0"],
19+
}
20+
1721
bootstrap_go_package {
1822
name: "soong-bpf",
1923
pkgPath: "android/soong/bpf",

Diff for: bpfix/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
// androidmk Android.mk to Blueprints translator
1717
//
1818

19+
package {
20+
default_applicable_licenses: ["Android-Apache-2.0"],
21+
}
22+
1923
blueprint_go_binary {
2024
name: "bpfix",
2125
srcs: [

Diff for: cc/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
bootstrap_go_package {
26
name: "soong-cc",
37
pkgPath: "android/soong/cc",

Diff for: cc/config/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
bootstrap_go_package {
26
name: "soong-cc-config",
37
pkgPath: "android/soong/cc/config",

Diff for: cc/libbuildversion/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
cc_library_static {
26
name: "libbuildversion",
37
host_supported: true,

Diff for: cc/libbuildversion/tests/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
cc_defaults {
26
name: "build_version_test_defaults",
37
use_version_lib: true,

Diff for: cc/ndk_api_coverage_parser/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
// limitations under the License.
1515
//
1616

17+
package {
18+
default_applicable_licenses: ["Android-Apache-2.0"],
19+
}
20+
1721
python_library_host {
1822
name: "ndk_api_coverage_parser_lib",
1923
pkg_path: "ndk_api_coverage_parser",

Diff for: cc/ndkstubgen/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
// limitations under the License.
1515
//
1616

17+
package {
18+
default_applicable_licenses: ["Android-Apache-2.0"],
19+
}
20+
1721
python_binary_host {
1822
name: "ndkstubgen",
1923
pkg_path: "ndkstubgen",

Diff for: cc/symbolfile/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
// limitations under the License.
1515
//
1616

17+
package {
18+
default_applicable_licenses: ["Android-Apache-2.0"],
19+
}
20+
1721
python_library_host {
1822
name: "symbolfile",
1923
pkg_path: "symbolfile",

Diff for: cmd/dep_fixer/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
blueprint_go_binary {
1620
name: "dep_fixer",
1721
deps: ["soong-makedeps"],

Diff for: cmd/diff_target_files/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
blueprint_go_binary {
26
name: "diff_target_files",
37
srcs: [

Diff for: cmd/extract_apks/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
blueprint_go_binary {
26
name: "extract_apks",
37
srcs: ["main.go"],

Diff for: cmd/extract_jar_packages/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
blueprint_go_binary {
1620
name: "extract_jar_packages",
1721
deps: [

Diff for: cmd/extract_linker/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
blueprint_go_binary {
1620
name: "extract_linker",
1721
srcs: ["main.go"],

Diff for: cmd/fileslist/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
blueprint_go_binary {
1620
name: "fileslist",
1721
srcs: [

Diff for: cmd/host_bionic_inject/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
blueprint_go_binary {
1620
name: "host_bionic_inject",
1721
deps: ["soong-symbol_inject"],

Diff for: cmd/javac_wrapper/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
blueprint_go_binary {
1620
name: "soong_javac_wrapper",
1721
srcs: [

Diff for: cmd/merge_zips/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
blueprint_go_binary {
1620
name: "merge_zips",
1721
deps: [

Diff for: cmd/multiproduct_kati/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
blueprint_go_binary {
1620
name: "multiproduct_kati",
1721
deps: [

Diff for: cmd/path_interposer/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
blueprint_go_binary {
1620
name: "path_interposer",
1721
deps: ["soong-ui-build-paths"],

Diff for: cmd/pom2bp/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
blueprint_go_binary {
1620
name: "pom2bp",
1721
deps: [

Diff for: cmd/pom2mk/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
blueprint_go_binary {
1620
name: "pom2mk",
1721
deps: ["blueprint-proptools"],

Diff for: cmd/sbox/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
blueprint_go_binary {
1620
name: "sbox",
1721
deps: [

Diff for: cmd/soong_build/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
bootstrap_go_binary {
1620
name: "soong_build",
1721
deps: [

Diff for: cmd/soong_env/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
bootstrap_go_binary {
1620
name: "soong_env",
1721
deps: [

Diff for: cmd/soong_ui/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
blueprint_go_binary {
1620
name: "soong_ui",
1721
deps: [

Diff for: cmd/zip2zip/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
blueprint_go_binary {
1620
name: "zip2zip",
1721
deps: [

Diff for: cmd/zipsync/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
package {
16+
default_applicable_licenses: ["Android-Apache-2.0"],
17+
}
18+
1519
blueprint_go_binary {
1620
name: "zipsync",
1721
deps: [

Diff for: cuj/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
blueprint_go_binary {
26
name: "cuj_tests",
37
deps: [

Diff for: dexpreopt/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
bootstrap_go_package {
26
name: "soong-dexpreopt",
37
pkgPath: "android/soong/dexpreopt",

Diff for: dexpreopt/dexpreopt_gen/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
blueprint_go_binary {
26
name: "dexpreopt_gen",
37
srcs: [

Diff for: env/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
bootstrap_go_package {
26
name: "soong-env",
37
pkgPath: "android/soong/env",

Diff for: etc/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
bootstrap_go_package {
26
name: "soong-etc",
37
pkgPath: "android/soong/etc",

Diff for: filesystem/Android.bp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
package {
2+
default_applicable_licenses: ["Android-Apache-2.0"],
3+
}
4+
15
bootstrap_go_package {
26
name: "soong-filesystem",
37
pkgPath: "android/soong/filesystem",

0 commit comments

Comments
 (0)