diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-08 16:01:40 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-08 16:01:40 +0000 |
commit | 960fc7594adb3518e195b9894a510a93f6d3ff60 (patch) | |
tree | 3d0f6532dde961e17aa921b9a5e76681a0b47fff | |
parent | 2159960ab2f329f1cc8326a46a968f52a4dcb81a (diff) | |
parent | 2955fbc6ae54f18375684e1d933c83907978f92f (diff) | |
download | mock-android12-mainline-tzdata2-release.tar.gz |
Snap for 8426163 from 2955fbc6ae54f18375684e1d933c83907978f92f to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100
Change-Id: I3aab26a8997d8ff853687bda6459f3b9fcf89257
-rw-r--r-- | Android.bp | 31 | ||||
-rw-r--r-- | TEST_MAPPING | 8 | ||||
-rw-r--r-- | mock/Android.bp | 9 |
3 files changed, 8 insertions, 40 deletions
diff --git a/Android.bp b/Android.bp deleted file mode 100644 index e3996cc..0000000 --- a/Android.bp +++ /dev/null @@ -1,31 +0,0 @@ -// -// Copyright (C) 2021 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package { - default_applicable_licenses: ["external_python_mock_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "external_python_mock_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-BSD", - ], - license_text: [ - "LICENSE.txt", - ], -} diff --git a/TEST_MAPPING b/TEST_MAPPING new file mode 100644 index 0000000..61a80b2 --- /dev/null +++ b/TEST_MAPPING @@ -0,0 +1,8 @@ +{ + "presubmit" : [ + { + "name" : "acloud_test", + "host" : true + } + ] +} diff --git a/mock/Android.bp b/mock/Android.bp index 5a30424..fad055b 100644 --- a/mock/Android.bp +++ b/mock/Android.bp @@ -12,15 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "external_python_mock_license" - // to get the below license kinds: - // SPDX-license-identifier-BSD - default_applicable_licenses: ["external_python_mock_license"], -} - python_library { name: "py-mock", host_supported: true, |