Upgrade emulator to emu-master-dev build 7479360
Bug: 191502832
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Iaa77e11e26bfb6559c07d7a6886e708ab785ba94
Merged-In: Iaa77e11e26bfb6559c07d7a6886e708ab785ba94
diff --git a/darwin-x86_64/emulator b/darwin-x86_64/emulator
index ee0b43c..7d62fce 100755
--- a/darwin-x86_64/emulator
+++ b/darwin-x86_64/emulator
Binary files differ
diff --git a/darwin-x86_64/emulator-check b/darwin-x86_64/emulator-check
index bac31de..de97d77 100755
--- a/darwin-x86_64/emulator-check
+++ b/darwin-x86_64/emulator-check
Binary files differ
diff --git a/darwin-x86_64/lib/advancedFeatures.ini b/darwin-x86_64/lib/advancedFeatures.ini
index b750e0b..bc32a4f 100644
--- a/darwin-x86_64/lib/advancedFeatures.ini
+++ b/darwin-x86_64/lib/advancedFeatures.ini
@@ -385,10 +385,14 @@
GnssGrpcV1 = on
# AndroidbootProps--------------------------------------------------------------
+# AndroidbootProps2-------------------------------------------------------------
# If enabled, the boot userspace properties (e.g. `qemu=1` or
# `qemu.opengles.version=123456`) are passed in the ramdisk instead of
# the kernel command line (which is deprecated for these purposes).
+# AndroidbootProps2 does not populate `qemu` and `androidboot.hardware` on the
+# host side since they are constants.
AndroidbootProps = on
+AndroidbootProps2 = on
# DeviceSkinOverlay-------------------------------------------------------------
# Apply overlay for each enabled devices (pixel devices)
diff --git a/darwin-x86_64/lib/advancedFeaturesCanary.ini b/darwin-x86_64/lib/advancedFeaturesCanary.ini
index ae4f6c0..e8a9412 100644
--- a/darwin-x86_64/lib/advancedFeaturesCanary.ini
+++ b/darwin-x86_64/lib/advancedFeaturesCanary.ini
@@ -390,10 +390,14 @@
GnssGrpcV1 = on
# AndroidbootProps--------------------------------------------------------------
+# AndroidbootProps2-------------------------------------------------------------
# If enabled, the boot userspace properties (e.g. `qemu=1` or
# `qemu.opengles.version=123456`) are passed in the ramdisk instead of
# the kernel command line (which is deprecated for these purposes).
+# AndroidbootProps2 does not populate `qemu` and `androidboot.hardware` on the
+# host side since they are constants.
AndroidbootProps = on
+AndroidbootProps2 = on
# DeviceSkinOverlay-------------------------------------------------------------
# Apply overlay for each enabled devices (pixel devices)
diff --git a/darwin-x86_64/lib64/libOpenglRender.dylib b/darwin-x86_64/lib64/libOpenglRender.dylib
index 612e5e3..3acb241 100755
--- a/darwin-x86_64/lib64/libOpenglRender.dylib
+++ b/darwin-x86_64/lib64/libOpenglRender.dylib
Binary files differ
diff --git a/darwin-x86_64/lib64/libemugl_common.dylib b/darwin-x86_64/lib64/libemugl_common.dylib
index d9a011a..25a1f7d 100755
--- a/darwin-x86_64/lib64/libemugl_common.dylib
+++ b/darwin-x86_64/lib64/libemugl_common.dylib
Binary files differ
diff --git a/darwin-x86_64/lib64/libimage_converter.dylib b/darwin-x86_64/lib64/libimage_converter.dylib
index 7fd41af..a433fac 100755
--- a/darwin-x86_64/lib64/libimage_converter.dylib
+++ b/darwin-x86_64/lib64/libimage_converter.dylib
Binary files differ
diff --git a/darwin-x86_64/mksdcard b/darwin-x86_64/mksdcard
index aa33adc..a327247 100755
--- a/darwin-x86_64/mksdcard
+++ b/darwin-x86_64/mksdcard
Binary files differ
diff --git a/darwin-x86_64/perfetto-protozero-protoc-plugin b/darwin-x86_64/perfetto-protozero-protoc-plugin
index a1ffd12..04fe489 100755
--- a/darwin-x86_64/perfetto-protozero-protoc-plugin
+++ b/darwin-x86_64/perfetto-protozero-protoc-plugin
Binary files differ
diff --git a/darwin-x86_64/qemu-img b/darwin-x86_64/qemu-img
index 75b8b61..3d9f293 100755
--- a/darwin-x86_64/qemu-img
+++ b/darwin-x86_64/qemu-img
Binary files differ
diff --git a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-aarch64 b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-aarch64
index bdf8d66..59606fd 100755
--- a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-aarch64
+++ b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-aarch64
Binary files differ
diff --git a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-aarch64-headless b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-aarch64-headless
index 809efcf..2fb3bd0 100755
--- a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-aarch64-headless
+++ b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-aarch64-headless
Binary files differ
diff --git a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-armel b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-armel
index badef9c..b78ff77 100755
--- a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-armel
+++ b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-armel
Binary files differ
diff --git a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-armel-headless b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-armel-headless
index 0346410..34e24a9 100755
--- a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-armel-headless
+++ b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-armel-headless
Binary files differ
diff --git a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-i386 b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-i386
index 3f02a0b..30be4f8 100755
--- a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-i386
+++ b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-i386
Binary files differ
diff --git a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-i386-headless b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-i386-headless
index 842584a..56344f3 100755
--- a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-i386-headless
+++ b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-i386-headless
Binary files differ
diff --git a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-x86_64 b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-x86_64
index bf3aa77..6ef2645 100755
--- a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-x86_64
+++ b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-x86_64
Binary files differ
diff --git a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-x86_64-headless b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-x86_64-headless
index 513cec7..e527f1f 100755
--- a/darwin-x86_64/qemu/darwin-x86_64/qemu-system-x86_64-headless
+++ b/darwin-x86_64/qemu/darwin-x86_64/qemu-system-x86_64-headless
Binary files differ
diff --git a/darwin-x86_64/qsn b/darwin-x86_64/qsn
index 60e4f65..802ed36 100755
--- a/darwin-x86_64/qsn
+++ b/darwin-x86_64/qsn
Binary files differ
diff --git a/darwin-x86_64/source.properties b/darwin-x86_64/source.properties
index 8c5f65b..aadb577 100644
--- a/darwin-x86_64/source.properties
+++ b/darwin-x86_64/source.properties
@@ -1,5 +1,5 @@
Pkg.UserSrc=false
-Pkg.Revision=30.7.3
+Pkg.Revision=30.7.4
Pkg.Path=emulator
Pkg.Desc=Android Emulator
-Pkg.BuildId=7425822
\ No newline at end of file
+Pkg.BuildId=7479360
\ No newline at end of file
diff --git a/linux-x86_64/emulator b/linux-x86_64/emulator
index 1c349d9..380f2f4 100755
--- a/linux-x86_64/emulator
+++ b/linux-x86_64/emulator
Binary files differ
diff --git a/linux-x86_64/goldfish-webrtc-bridge b/linux-x86_64/goldfish-webrtc-bridge
index a0f069d..9ddc792 100755
--- a/linux-x86_64/goldfish-webrtc-bridge
+++ b/linux-x86_64/goldfish-webrtc-bridge
Binary files differ
diff --git a/linux-x86_64/lib/advancedFeatures.ini b/linux-x86_64/lib/advancedFeatures.ini
index b750e0b..bc32a4f 100644
--- a/linux-x86_64/lib/advancedFeatures.ini
+++ b/linux-x86_64/lib/advancedFeatures.ini
@@ -385,10 +385,14 @@
GnssGrpcV1 = on
# AndroidbootProps--------------------------------------------------------------
+# AndroidbootProps2-------------------------------------------------------------
# If enabled, the boot userspace properties (e.g. `qemu=1` or
# `qemu.opengles.version=123456`) are passed in the ramdisk instead of
# the kernel command line (which is deprecated for these purposes).
+# AndroidbootProps2 does not populate `qemu` and `androidboot.hardware` on the
+# host side since they are constants.
AndroidbootProps = on
+AndroidbootProps2 = on
# DeviceSkinOverlay-------------------------------------------------------------
# Apply overlay for each enabled devices (pixel devices)
diff --git a/linux-x86_64/lib/advancedFeaturesCanary.ini b/linux-x86_64/lib/advancedFeaturesCanary.ini
index ae4f6c0..e8a9412 100644
--- a/linux-x86_64/lib/advancedFeaturesCanary.ini
+++ b/linux-x86_64/lib/advancedFeaturesCanary.ini
@@ -390,10 +390,14 @@
GnssGrpcV1 = on
# AndroidbootProps--------------------------------------------------------------
+# AndroidbootProps2-------------------------------------------------------------
# If enabled, the boot userspace properties (e.g. `qemu=1` or
# `qemu.opengles.version=123456`) are passed in the ramdisk instead of
# the kernel command line (which is deprecated for these purposes).
+# AndroidbootProps2 does not populate `qemu` and `androidboot.hardware` on the
+# host side since they are constants.
AndroidbootProps = on
+AndroidbootProps2 = on
# DeviceSkinOverlay-------------------------------------------------------------
# Apply overlay for each enabled devices (pixel devices)
diff --git a/linux-x86_64/lib64/libOpenglRender.so b/linux-x86_64/lib64/libOpenglRender.so
index 10374e9..67d2f2e 100644
--- a/linux-x86_64/lib64/libOpenglRender.so
+++ b/linux-x86_64/lib64/libOpenglRender.so
Binary files differ
diff --git a/linux-x86_64/lib64/libimage_converter.so b/linux-x86_64/lib64/libimage_converter.so
index b531f49..7454a1e 100644
--- a/linux-x86_64/lib64/libimage_converter.so
+++ b/linux-x86_64/lib64/libimage_converter.so
Binary files differ
diff --git a/linux-x86_64/qemu-img b/linux-x86_64/qemu-img
index 390a5a8..b6ab6f9 100755
--- a/linux-x86_64/qemu-img
+++ b/linux-x86_64/qemu-img
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64 b/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64
index 1faf96c..0036ede 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64-headless b/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64-headless
index ac9df91..718a535 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64-headless
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-aarch64-headless
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-armel b/linux-x86_64/qemu/linux-x86_64/qemu-system-armel
index b584b8a..359e63a 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-armel
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-armel
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-armel-headless b/linux-x86_64/qemu/linux-x86_64/qemu-system-armel-headless
index 22c5c1a..59c220d 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-armel-headless
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-armel-headless
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-i386 b/linux-x86_64/qemu/linux-x86_64/qemu-system-i386
index fe1ac7d..b2bddef 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-i386
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-i386
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-i386-headless b/linux-x86_64/qemu/linux-x86_64/qemu-system-i386-headless
index 04e022f..6989ec9 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-i386-headless
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-i386-headless
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64 b/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64
index 3e9ce53..d29214b 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64
Binary files differ
diff --git a/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64-headless b/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64-headless
index 14074c2..be28c04 100755
--- a/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64-headless
+++ b/linux-x86_64/qemu/linux-x86_64/qemu-system-x86_64-headless
Binary files differ
diff --git a/linux-x86_64/qsn b/linux-x86_64/qsn
index 7659f6e..65de283 100755
--- a/linux-x86_64/qsn
+++ b/linux-x86_64/qsn
Binary files differ
diff --git a/linux-x86_64/source.properties b/linux-x86_64/source.properties
index 8c5f65b..aadb577 100644
--- a/linux-x86_64/source.properties
+++ b/linux-x86_64/source.properties
@@ -1,5 +1,5 @@
Pkg.UserSrc=false
-Pkg.Revision=30.7.3
+Pkg.Revision=30.7.4
Pkg.Path=emulator
Pkg.Desc=Android Emulator
-Pkg.BuildId=7425822
\ No newline at end of file
+Pkg.BuildId=7479360
\ No newline at end of file
