Snap for 8730993 from c1b29e8ac09260fde4df42b611fea78c351dda91 to mainline-tzdata3-release
Change-Id: I1a9d6f25ff72842f22f72bfed6b054c44cee7879
diff --git a/.gitmodules.disabled b/.gitmodules
similarity index 100%
rename from .gitmodules.disabled
rename to .gitmodules
diff --git a/Android.bp b/Android.bp
index 88e9b12..79cafd4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -133,11 +133,6 @@
sdk_version: "9",
stl: "c++_static",
- apex_available: [
- "//apex_available:platform",
- "com.android.adservices",
- ],
- min_sdk_version: "33",
}
// C++ lite library for the platform and host.
@@ -145,7 +140,6 @@
cc_library {
name: "libprotobuf-cpp-lite",
host_supported: true,
- ramdisk_available: true,
recovery_available: true,
vendor_available: true,
vendor_ramdisk_available: true,
@@ -272,11 +266,9 @@
},
apex_available: [
"//apex_available:platform",
- "com.android.bluetooth",
"com.android.appsearch",
"com.android.virt",
],
- min_sdk_version: "29",
}
// Compiler library for the host
@@ -497,7 +489,7 @@
apex_available: [
"//apex_available:platform",
// TODO(b/151068271) switch this to //apex_available:anyapex
- "com.android.bluetooth",
+ "com.android.bluetooth.updatable",
],
}
@@ -616,12 +608,10 @@
"//apex_available:platform",
// TODO(b/151068271) switch below to //apex_available:anyapex
"com.android.permission",
- "com.android.bluetooth",
+ "com.android.bluetooth.updatable",
"com.android.tethering",
"com.android.wifi",
"com.android.extservices",
- "com.android.car.framework",
- "com.android.uwb",
],
}
diff --git a/METADATA b/METADATA
index 18b6a93..eb67a96 100644
--- a/METADATA
+++ b/METADATA
@@ -14,9 +14,6 @@
# Also update the suffix in Android.bp when updating the version.
version: "v3.9.1"
last_upgrade_date { year: 2019 month: 8 day: 23 }
- license_note: "would be NOTICE save for GPL in java/core/src/stubs/sun/misc/Unsafe.java"
+ # would be NOTICE save for GPL in java/core/src/stubs/sun/misc/Unsafe.java
license_type: RESTRICTED
- security {
- tag: "NVD-CPE2.3:cpe:/a:google:protobuf:3.9.0"
- }
}
diff --git a/third_party/benchmark b/third_party/benchmark
new file mode 160000
index 0000000..5b7683f
--- /dev/null
+++ b/third_party/benchmark
@@ -0,0 +1 @@
+Subproject commit 5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8
diff --git a/third_party/googletest b/third_party/googletest
new file mode 160000
index 0000000..5ec7f0c
--- /dev/null
+++ b/third_party/googletest
@@ -0,0 +1 @@
+Subproject commit 5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081
