Snap for 7550844 from f27c7ff01c843f995ba6b689c314550b32cae9a1 to mainline-tethering-release
Change-Id: Ib3d8b983830e81e0b114c259b056911b5db354c9
diff --git a/Android.bp b/Android.bp
index 2da8697..6648cf6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,43 @@
// 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",
@@ -78,7 +115,8 @@
],
header_libs: [
- "libopenjdkjvmti_headers",
+ "jni_headers",
+ "libopenjdkjvmti_headers",
],
}
@@ -89,6 +127,7 @@
"dexmaker_agent_defaults",
],
srcs: ["dexmaker-mockito-inline/src/main/jni/**/*.cc"],
+ min_sdk_version: "29",
}
// Build agent for Dexmaker's extended MockMaker
@@ -98,6 +137,7 @@
"dexmaker_agent_defaults",
],
srcs: ["dexmaker-mockito-inline-extended/src/main/jni/**/*.cc"],
+ min_sdk_version: "29",
}
// Build agent for Dexmaker's inline tests
@@ -137,7 +177,7 @@
],
required: [
"libdexmakerjvmtiagent",
- "libstaticjvmtiagent"
+ "libstaticjvmtiagent",
],
}
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
+}
diff --git a/OWNERS b/OWNERS
index 97b24b6..5119321 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,2 @@
-jmonk@google.com
paulduffin@google.com
-moltmann@google.com
xutan@google.com
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
new file mode 100644
index 0000000..b558ce7
--- /dev/null
+++ b/PREUPLOAD.cfg
@@ -0,0 +1,2 @@
+[Builtin Hooks]
+bpfmt = true
\ No newline at end of file
