Snap for 8426163 from 100eea62311c8dd6bf44b4b30fbec22d52542a5e to mainline-tzdata2-release
Change-Id: I9be8e0be45e1a7394a6030cfcd53b111efad2a8b
diff --git a/Android.bp b/Android.bp
index 72c2938..702d27d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,20 +1,3 @@
-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
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_APACHE2
diff --git a/OWNERS b/OWNERS
index 3576576..91d08a5 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 e0e7323..fc98bc3 100644
--- a/dexgen/Android.bp
+++ b/dexgen/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 "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 9ba301b..15f82c1 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 @@
}
}
- // Check the amount written.
+ // Sanity check of 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 3e2eb4d..8021145 100644
--- a/docs/debugmon.html
+++ b/docs/debugmon.html
@@ -198,7 +198,7 @@
<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. The same type must always be used in
+a response to the query. For sanity the 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 bb2a68f..d641fe6 100644
--- a/dx/Android.bp
+++ b/dx/Android.bp
@@ -7,23 +7,6 @@
// 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",
@@ -34,5 +17,8 @@
pdk: {
enabled: false,
},
+ unbundled_build: {
+ enabled: false,
+ },
},
}
diff --git a/dx/Android.mk b/dx/Android.mk
index 78d2d40..c6aa01d 100644
--- a/dx/Android.mk
+++ b/dx/Android.mk
@@ -16,9 +16,6 @@
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
@@ -38,9 +35,6 @@
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
@@ -60,9 +54,6 @@
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)
@@ -86,9 +77,6 @@
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
@@ -111,9 +99,6 @@
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
@@ -132,9 +117,6 @@
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
@@ -144,3 +126,5 @@
$(hide) chmod 644 $@
INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
+
+
diff --git a/dx/junit-tests/Android.bp b/dx/junit-tests/Android.bp
index 1fcc792..9caeb96 100644
--- a/dx/junit-tests/Android.bp
+++ b/dx/junit-tests/Android.bp
@@ -1,26 +1,10 @@
// 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"],
- // Avoid anything depending on this target
- visibility: ["//visibility:private"],
- static_libs: [
- "dx",
- ],
libs: [
+ "dx",
"junit-host",
],
- test_options: {
- unit_test: true,
- },
}
diff --git a/dx/src/Android.bp b/dx/src/Android.bp
index 62c65d7..9459e27 100644
--- a/dx/src/Android.bp
+++ b/dx/src/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 "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: [
@@ -44,6 +35,7 @@
":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 ec156d6..e76110f 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 @@
* should be subroutineSuccessor
*/
- // Check we have the expected subroutine.
+ // Sanity check
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 d8d4a22..a83b545 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 @@
}
}
- // Check the amount written.
+ // Sanity check of 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 3d914bf..98b3aba 100644
--- a/tools/dexdeps/Android.bp
+++ b/tools/dexdeps/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 "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 7487902..ad76e4d 100644
--- a/tools/dexdeps/src/Android.bp
+++ b/tools/dexdeps/src/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 "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: [
@@ -34,8 +25,6 @@
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 ca5343e..4a7a317 100644
--- a/tools/hprof-conv/Android.bp
+++ b/tools/hprof-conv/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 "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"],
