diff options
author | Bob Badour <bbadour@google.com> | 2021-02-16 01:02:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 01:02:13 +0000 |
commit | 032bf615aa70ba68cdaa47cda031c43c412d1fbc (patch) | |
tree | b18abfb935fed09d516cd3314d2566030cc3a1ce | |
parent | 05235b7a21f71edd5b34e1f387f7d07ecac7c20b (diff) | |
parent | 1d0757e01af1d48b7ccc436184b5ecefb000b143 (diff) | |
download | xsdc-032bf615aa70ba68cdaa47cda031c43c412d1fbc.tar.gz |
[LSC] Add LOCAL_LICENSE_KINDS to system/tools/xsdc am: 3aa4c42ca7 am: 53509f157c am: 1d0757e01a
Original change: https://android-review.googlesource.com/c/platform/system/tools/xsdc/+/1589074
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I179b7c8e950065a5769a96ed542cf06d038a7786
-rw-r--r-- | Android.bp | 6 | ||||
-rw-r--r-- | build/Android.bp | 4 | ||||
-rw-r--r-- | tests/Android.bp | 4 | ||||
-rw-r--r-- | tests/resources/attr_group_simple/Android.bp | 5 | ||||
-rw-r--r-- | tests/resources/enum_type/Android.bp | 4 | ||||
-rw-r--r-- | tests/resources/group/Android.bp | 5 | ||||
-rw-r--r-- | tests/resources/nested_type/Android.bp | 5 | ||||
-rw-r--r-- | tests/resources/predefined_types/Android.bp | 5 | ||||
-rw-r--r-- | tests/resources/purchase_simple/Android.bp | 5 | ||||
-rw-r--r-- | tests/resources/reference/Android.bp | 5 | ||||
-rw-r--r-- | tests/resources/simple_complex_content/Android.bp | 5 | ||||
-rw-r--r-- | tests/resources/simple_type/Android.bp | 5 | ||||
-rw-r--r-- | utils/Android.bp | 4 |
13 files changed, 53 insertions, 9 deletions
@@ -1,3 +1,7 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + java_binary_host { name: "xsdc", srcs: ["src/**/*.java"], @@ -5,4 +9,4 @@ java_binary_host { "commons-cli-1.2", ], manifest: "MANIFEST.MF" -}
\ No newline at end of file +} diff --git a/build/Android.bp b/build/Android.bp index befa978..446cd8f 100644 --- a/build/Android.bp +++ b/build/Android.bp @@ -12,6 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + bootstrap_go_package { name: "xsdc-soong-rules", pkgPath: "android/soong/xsdc", diff --git a/tests/Android.bp b/tests/Android.bp index a0e6c99..d49369b 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -1,3 +1,7 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + java_test_host { name: "xsdc-java-tests", srcs: [ diff --git a/tests/resources/attr_group_simple/Android.bp b/tests/resources/attr_group_simple/Android.bp index 29ae5fc..ef3136d 100644 --- a/tests/resources/attr_group_simple/Android.bp +++ b/tests/resources/attr_group_simple/Android.bp @@ -1,8 +1,11 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + xsd_config { name: "xsdc_attr_group_simple_tests", srcs: ["attr_group_simple.xsd"], package_name: "attr.group.simple", gen_writer: true, } - diff --git a/tests/resources/enum_type/Android.bp b/tests/resources/enum_type/Android.bp index 04878a2..979ae6d 100644 --- a/tests/resources/enum_type/Android.bp +++ b/tests/resources/enum_type/Android.bp @@ -1,3 +1,7 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + xsd_config { name: "xsdc_attr_enumtype_tests", srcs: ["attr_enumtype.xsd"], diff --git a/tests/resources/group/Android.bp b/tests/resources/group/Android.bp index c0e8335..6560ffd 100644 --- a/tests/resources/group/Android.bp +++ b/tests/resources/group/Android.bp @@ -1,8 +1,11 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + xsd_config { name: "xsdc_group_tests", srcs: ["group.xsd"], package_name: "group", gen_writer: true, } - diff --git a/tests/resources/nested_type/Android.bp b/tests/resources/nested_type/Android.bp index f965abf..15140fb 100644 --- a/tests/resources/nested_type/Android.bp +++ b/tests/resources/nested_type/Android.bp @@ -1,8 +1,11 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + xsd_config { name: "xsdc_nested_type_tests", srcs: ["nested_type.xsd"], package_name: "nested.type", gen_writer: true, } - diff --git a/tests/resources/predefined_types/Android.bp b/tests/resources/predefined_types/Android.bp index b25e7f7..05f2ae0 100644 --- a/tests/resources/predefined_types/Android.bp +++ b/tests/resources/predefined_types/Android.bp @@ -1,8 +1,11 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + xsd_config { name: "xsdc_predefined_types_tests", srcs: ["predefined_types.xsd"], package_name: "predefined.types", gen_writer: true, } - diff --git a/tests/resources/purchase_simple/Android.bp b/tests/resources/purchase_simple/Android.bp index fda6ff4..0773cb8 100644 --- a/tests/resources/purchase_simple/Android.bp +++ b/tests/resources/purchase_simple/Android.bp @@ -1,8 +1,11 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + xsd_config { name: "xsdc_purchase_simple_tests", srcs: ["purchase_simple.xsd"], package_name: "purchase.simple", gen_writer: true, } - diff --git a/tests/resources/reference/Android.bp b/tests/resources/reference/Android.bp index b3132ba..b0e7bca 100644 --- a/tests/resources/reference/Android.bp +++ b/tests/resources/reference/Android.bp @@ -1,4 +1,8 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + xsd_config { name: "xsdc_reference_tests", srcs: ["reference.xsd"], @@ -6,4 +10,3 @@ xsd_config { gen_writer: true, nullability: true, } - diff --git a/tests/resources/simple_complex_content/Android.bp b/tests/resources/simple_complex_content/Android.bp index 36077db..00502cb 100644 --- a/tests/resources/simple_complex_content/Android.bp +++ b/tests/resources/simple_complex_content/Android.bp @@ -1,4 +1,8 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + xsd_config { name: "xsdc_simple_complex_content_tests", srcs: ["simple_complex_content.xsd"], @@ -6,4 +10,3 @@ xsd_config { gen_writer: true, gen_has: true, } - diff --git a/tests/resources/simple_type/Android.bp b/tests/resources/simple_type/Android.bp index e47a461..9bf2a52 100644 --- a/tests/resources/simple_type/Android.bp +++ b/tests/resources/simple_type/Android.bp @@ -1,8 +1,11 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + xsd_config { name: "xsdc_simple_type_tests", srcs: ["simple_type.xsd"], package_name: "simple.type", gen_writer: true, } - diff --git a/utils/Android.bp b/utils/Android.bp index 2c1cf73..5204bbc 100644 --- a/utils/Android.bp +++ b/utils/Android.bp @@ -12,6 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + cc_library_headers { name: "libxsdc-utils", export_include_dirs: ["include"], |