summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-07-14 00:43:33 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-07-14 00:43:33 +0000
commit7536934bd359a1591a62a3a72b5927c21af2c68f (patch)
tree9d5f5f55f2fc50a9287d24b462d5b9ac7e590545
parent016a924b9b046ecbb39ef13bac3f44a4a1458b12 (diff)
parent50ed736e6915770fd8fc40400784dc16f49eb6c6 (diff)
downloaddalvik-android-mainline-12.0.0_r34.tar.gz
Snap for 7547121 from 50ed736e6915770fd8fc40400784dc16f49eb6c6 to mainline-permission-releaseandroid-mainline-12.0.0_r93android-mainline-12.0.0_r79android-mainline-12.0.0_r64android-mainline-12.0.0_r51android-mainline-12.0.0_r34android-mainline-12.0.0_r15android-mainline-12.0.0_r123android-mainline-12.0.0_r107android12-mainline-permission-release
Change-Id: I7240f0c9def901303cfcaaf82f2c1713b67637a6
Diffstat
-rw-r--r--Android.bp17
-rw-r--r--MODULE_LICENSE_APACHE20
-rw-r--r--OWNERS2
-rw-r--r--dexgen/Android.bp9
-rw-r--r--dexgen/src/com/android/dexgen/dex/code/DalvInsnList.java2
-rw-r--r--docs/debugmon.html2
-rw-r--r--dx/Android.bp20
-rw-r--r--dx/Android.mk20
-rw-r--r--dx/junit-tests/Android.bp18
-rw-r--r--dx/src/Android.bp10
-rw-r--r--dx/src/com/android/dx/cf/code/Ropper.java2
-rw-r--r--dx/src/com/android/dx/dex/code/DalvInsnList.java2
-rw-r--r--tools/dexdeps/Android.bp9
-rw-r--r--tools/dexdeps/src/Android.bp13
-rw-r--r--tools/hprof-conv/Android.bp9
15 files changed, 122 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp
index 702d27da4..72c293855 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,20 @@
+package {
+ default_applicable_licenses: ["dalvik_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+ name: "dalvik_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ ],
+ license_text: [
+ "NOTICE",
+ ],
+}
+
subdirs = [
"dx",
"tools/hprof-conv",
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29bb..000000000
--- a/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/OWNERS b/OWNERS
index 91d08a51e..3576576d3 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,8 +2,8 @@
gavra@google.com
cmw@google.com
# ART
+calin@google.com
mathieuc@google.com
narayan@google.com
ngeoffray@google.com
oth@google.com
-sehr@google.com
diff --git a/dexgen/Android.bp b/dexgen/Android.bp
index fc98bc39f..e0e732392 100644
--- a/dexgen/Android.bp
+++ b/dexgen/Android.bp
@@ -12,6 +12,15 @@
// 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 "dalvik_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["dalvik_license"],
+}
+
java_library {
name: "dexgen",
sdk_version: "4",
diff --git a/dexgen/src/com/android/dexgen/dex/code/DalvInsnList.java b/dexgen/src/com/android/dexgen/dex/code/DalvInsnList.java
index 15f82c1a3..9ba301bf1 100644
--- a/dexgen/src/com/android/dexgen/dex/code/DalvInsnList.java
+++ b/dexgen/src/com/android/dexgen/dex/code/DalvInsnList.java
@@ -158,7 +158,7 @@ public final class DalvInsnList extends FixedSizeList {
}
}
- // Sanity check of the amount written.
+ // Check the amount written.
int written = (out.getCursor() - startCursor) / 2;
if (written != codeSize()) {
throw new RuntimeException("write length mismatch; expected " +
diff --git a/docs/debugmon.html b/docs/debugmon.html
index 80211456e..3e2eb4d27 100644
--- a/docs/debugmon.html
+++ b/docs/debugmon.html
@@ -198,7 +198,7 @@ need an "error" chunk type and a handler on the server side.]
<p>The same chunk type may have different meanings when sent in different
directions. For example, the same type may be used for both a query and
-a response to the query. For sanity the type must always be used in
+a response to the query. The same type must always be used in
related transactions.
<p>This is somewhat redundant with the JDWP framing, which includes a
diff --git a/dx/Android.bp b/dx/Android.bp
index d641fe634..bb2a68f43 100644
--- a/dx/Android.bp
+++ b/dx/Android.bp
@@ -7,6 +7,23 @@
// dx java library
// ============================================================
+package {
+ default_applicable_licenses: ["dalvik_dx_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+ name: "dalvik_dx_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ ],
+ license_text: [
+ "NOTICE",
+ ],
+}
+
java_binary_host {
name: "dx",
wrapper: "etc/dx",
@@ -17,8 +34,5 @@ java_binary_host {
pdk: {
enabled: false,
},
- unbundled_build: {
- enabled: false,
- },
},
}
diff --git a/dx/Android.mk b/dx/Android.mk
index c6aa01dd4..78d2d40c2 100644
--- a/dx/Android.mk
+++ b/dx/Android.mk
@@ -16,6 +16,9 @@ LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := mainDexClasses.rules
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
include $(BUILD_SYSTEM)/base_rules.mk
@@ -35,6 +38,9 @@ LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := mainDexClassesNoAapt.rules
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
include $(BUILD_SYSTEM)/base_rules.mk
@@ -54,6 +60,9 @@ LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := shrinkedAndroid
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
LOCAL_BUILT_MODULE_STEM := shrinkedAndroid.jar
LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
@@ -77,6 +86,9 @@ LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := mainDexClasses
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
include $(BUILD_SYSTEM)/base_rules.mk
@@ -99,6 +111,9 @@ LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := jasmin
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
include $(BUILD_SYSTEM)/base_rules.mk
@@ -117,6 +132,9 @@ LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := jasmin.jar
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
include $(BUILD_SYSTEM)/base_rules.mk
@@ -126,5 +144,3 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/jasmin.jar | $(ACP)
$(hide) chmod 644 $@
INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
-
-
diff --git a/dx/junit-tests/Android.bp b/dx/junit-tests/Android.bp
index 9caeb9629..1fcc792c1 100644
--- a/dx/junit-tests/Android.bp
+++ b/dx/junit-tests/Android.bp
@@ -1,10 +1,26 @@
// Copyright 2011 The Android Open Source Project
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "dalvik_dx_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["dalvik_dx_license"],
+}
+
java_test_host {
name: "dx-tests",
srcs: ["**/*.java"],
- libs: [
+ // Avoid anything depending on this target
+ visibility: ["//visibility:private"],
+ static_libs: [
"dx",
+ ],
+ libs: [
"junit-host",
],
+ test_options: {
+ unit_test: true,
+ },
}
diff --git a/dx/src/Android.bp b/dx/src/Android.bp
index 9459e27cf..62c65d7a5 100644
--- a/dx/src/Android.bp
+++ b/dx/src/Android.bp
@@ -12,6 +12,15 @@
// 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 "dalvik_dx_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["dalvik_dx_license"],
+}
+
droidstubs_host {
name: "dx-doc-stubs",
srcs: [
@@ -35,7 +44,6 @@ droiddoc_host {
":dx-doc-stubs",
],
custom_template: "droiddoc-templates-sdk",
- create_stubs: false,
product_variables: {
pdk: {
enabled: false,
diff --git a/dx/src/com/android/dx/cf/code/Ropper.java b/dx/src/com/android/dx/cf/code/Ropper.java
index e76110fa8..ec156d608 100644
--- a/dx/src/com/android/dx/cf/code/Ropper.java
+++ b/dx/src/com/android/dx/cf/code/Ropper.java
@@ -1591,7 +1591,7 @@ public final class Ropper {
* should be subroutineSuccessor
*/
- // Sanity check
+ // Check we have the expected subroutine.
if (subroutine.startBlock != subroutineStart) {
throw new RuntimeException (
"ret instruction returns to label "
diff --git a/dx/src/com/android/dx/dex/code/DalvInsnList.java b/dx/src/com/android/dx/dex/code/DalvInsnList.java
index a83b545fe..d8d4a2292 100644
--- a/dx/src/com/android/dx/dex/code/DalvInsnList.java
+++ b/dx/src/com/android/dx/dex/code/DalvInsnList.java
@@ -162,7 +162,7 @@ public final class DalvInsnList extends FixedSizeList {
}
}
- // Sanity check of the amount written.
+ // Check the amount written.
int written = (out.getCursor() - startCursor) / 2;
if (written != codeSize()) {
throw new RuntimeException("write length mismatch; expected " +
diff --git a/tools/dexdeps/Android.bp b/tools/dexdeps/Android.bp
index 98b3aba6c..3d914bf7e 100644
--- a/tools/dexdeps/Android.bp
+++ b/tools/dexdeps/Android.bp
@@ -12,6 +12,15 @@
// 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 "dalvik_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["dalvik_license"],
+}
+
java_binary_host {
name: "dexdeps",
manifest: "etc/manifest.txt",
diff --git a/tools/dexdeps/src/Android.bp b/tools/dexdeps/src/Android.bp
index ad76e4dd4..74879024e 100644
--- a/tools/dexdeps/src/Android.bp
+++ b/tools/dexdeps/src/Android.bp
@@ -12,6 +12,15 @@
// 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 "dalvik_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["dalvik_license"],
+}
+
droidstubs {
name: "dexdeps-doc-stubs",
srcs: [
@@ -25,6 +34,8 @@ droiddoc {
srcs: [
":dexdeps-doc-stubs",
],
+ libs: [
+ "stub-annotations",
+ ],
custom_template: "droiddoc-templates-sdk",
- create_stubs: false,
}
diff --git a/tools/hprof-conv/Android.bp b/tools/hprof-conv/Android.bp
index 4a7a317cd..ca5343e07 100644
--- a/tools/hprof-conv/Android.bp
+++ b/tools/hprof-conv/Android.bp
@@ -12,6 +12,15 @@
// 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 "dalvik_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["dalvik_license"],
+}
+
cc_binary_host {
name: "hprof-conv",
srcs: ["HprofConv.c"],
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 20:38:07 +0000