Snap for 8426163 from 9e115705753849a71d010af23f984a5aa560f0cb to mainline-tzdata2-release
Change-Id: Ie2a3ecc222a6f6bb113166ecf534153b340157a6
diff --git a/Android.bp b/Android.bp
index 6648cf6..2da8697 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,43 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package {
- default_applicable_licenses: ["external_dexmaker_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.
-//
-// large-scale-change included anything that looked like it might be a license
-// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
-//
-// Please consider removing redundant or irrelevant files from 'license_text:'.
-// See: http://go/android-license-faq
-license {
- name: "external_dexmaker_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-MIT",
- ],
- license_text: [
- "COPYING",
- "LICENSE",
- "NOTICE",
- ],
-}
-
java_library_static {
name: "dexmaker",
@@ -115,8 +78,7 @@
],
header_libs: [
- "jni_headers",
- "libopenjdkjvmti_headers",
+ "libopenjdkjvmti_headers",
],
}
@@ -127,7 +89,6 @@
"dexmaker_agent_defaults",
],
srcs: ["dexmaker-mockito-inline/src/main/jni/**/*.cc"],
- min_sdk_version: "29",
}
// Build agent for Dexmaker's extended MockMaker
@@ -137,7 +98,6 @@
"dexmaker_agent_defaults",
],
srcs: ["dexmaker-mockito-inline-extended/src/main/jni/**/*.cc"],
- min_sdk_version: "29",
}
// Build agent for Dexmaker's inline tests
@@ -177,7 +137,7 @@
],
required: [
"libdexmakerjvmtiagent",
- "libstaticjvmtiagent",
+ "libstaticjvmtiagent"
],
}
diff --git a/METADATA b/METADATA
deleted file mode 100644
index d97975c..0000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
- license_type: NOTICE
-}
diff --git a/OWNERS b/OWNERS
index 5119321..97b24b6 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,4 @@
+jmonk@google.com
paulduffin@google.com
+moltmann@google.com
xutan@google.com
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
deleted file mode 100644
index b558ce7..0000000
--- a/PREUPLOAD.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[Builtin Hooks]
-bpfmt = true
\ No newline at end of file
