diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-19 12:01:09 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-19 12:01:09 +0000 |
commit | 0dfdbaebd8ea5e9a0b8a5116a46df4e89dd10ffb (patch) | |
tree | 3c1badb7488f3ce3c9d358a7b9173f9756850092 | |
parent | 068ada767c295d9b040641db0d8ff8cf5c9c5a6e (diff) | |
parent | 04e935211a41e94ee35fe62e131d30ab034fe03e (diff) | |
download | apache-xml-android-mainline-12.0.0_r91.tar.gz |
Snap for 7474514 from 04e935211a41e94ee35fe62e131d30ab034fe03e to mainline-media-swcodec-releaseandroid-mainline-12.0.0_r91android-mainline-12.0.0_r75android-mainline-12.0.0_r47android-mainline-12.0.0_r30android-mainline-12.0.0_r13android-mainline-12.0.0_r120android-mainline-12.0.0_r105android12-mainline-media-swcodec-release
Change-Id: Ie63a8fff92f7993903e5ecf1f5ac14f1edef137a
-rw-r--r-- | Android.bp | 50 | ||||
-rw-r--r-- | METADATA | 3 |
2 files changed, 34 insertions, 19 deletions
@@ -16,6 +16,33 @@ package { default_visibility: ["//visibility:private"], + default_applicable_licenses: ["external_apache-xml_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_apache-xml_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-W3C", + ], + license_text: [ + "NOTICE", + ], } // The set of files that contribute to APIs. @@ -31,10 +58,12 @@ java_library { name: "apache-xml", visibility: [ "//art/build/apex", + "//art/build/sdk", "//libcore", + "//packages/modules/ArtPrebuilt", ], apex_available: [ - "com.android.art.release", + "com.android.art", "com.android.art.debug", ], srcs: ["src/main/java/**/*.java"], @@ -48,22 +77,5 @@ java_library { sdk_version: "none", system_modules: "core-all-system-modules", -} - -// A guaranteed unstripped version of apache-xml for use on device. -// The build system may or may not strip the apache-xml jar, but this one will -// not be stripped. See b/24535627. -java_library { - name: "apache-xml-testdex", - visibility: [ - "//art:__subpackages__", - ], - static_libs: ["apache-xml"], - - installable: true, - dex_preopt: { - enabled: false, - }, - - sdk_version: "core_platform", + min_sdk_version: "31", } diff --git a/METADATA b/METADATA new file mode 100644 index 0000000..d97975c --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} |