Snap for 11847214 from d53ee5ab9c to 24Q3-release

Change-Id: I1ee3a8a131b262c1b3ea89e200b1594871d2f507
This commit is contained in:
Android Build Coastguard Worker 2024-05-16 01:25:14 +00:00
commit e58d5d6e0c
4 changed files with 15 additions and 14 deletions

View file

@ -20,11 +20,13 @@
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="true" />
<option name="remount-system" value="true" />
<option name="push" value="mte_upgrade_test.rc->/system/etc/init/mte_upgrade_test.rc" />
<option name="push" value="mte_upgrade_test_helper->/system/bin/mte_upgrade_test_helper" />
<option name="push" value="mte_upgrade_test_helper->/data/local/tmp/app_process64" />
<option name="push-file" key="mte_upgrade_test.rc" value="/system/etc/init/mte_upgrade_test.rc" />
<option name="push-file" key="mte_upgrade_test_helper" value="/system/bin/mte_upgrade_test_helper" />
<option name="push-file" key="mte_upgrade_test_helper" value="/data/local/tmp/app_process64" />
<option name="post-push" value="chmod 644 /system/etc/init/mte_upgrade_test.rc" />
</target_preparer>
<test class="com.android.tradefed.testtype.HostTest" >
<option name="jar" value="mte_upgrade_test.jar" />
</test>
</configuration>
</configuration>

View file

@ -0,0 +1,5 @@
fmayer@google.com
eugenis@google.com
mitchp@google.com
pcc@google.com

View file

@ -22,6 +22,7 @@
#include <sys/prctl.h>
#include <time.h>
#include <unistd.h>
#include <memory>
int MaybeDowngrade() {
@ -65,7 +66,5 @@ int main(int argc, char** argv) {
// This binary gets run by src/com/android/tests/init/MteUpgradeTest.java, which
// asserts that it crashes as expected.
f[17] = 'x';
char buf[1];
read(1, buf, 1);
return 0;
}

View file

@ -402,7 +402,7 @@ static const struct option long_options[] = {
static void usage(void)
{
fprintf(stderr,
"Usage: mkbootfs [-n FILE] [-d DIR|-F FILE] DIR...\n"
"Usage: mkbootfs [-n FILE] [-d DIR|-f FILE] DIR...\n"
"\n"
"\t-d, --dirname=DIR: fs-config directory\n"
"\t-f, --file=FILE: Canned configuration file\n"
@ -410,11 +410,11 @@ static void usage(void)
"\t-n, --nodes=FILE: Dev nodes description file\n"
"\n"
"Dev nodes description:\n"
"\t[dir|nod] [perms] [uid] [gid] [c|b] [minor] [major]\n"
"\t[dir|nod] [perms] [uid] [gid] [c|b] [major] [minor]\n"
"\tExample:\n"
"\t\t# My device nodes\n"
"\t\tdir dev 0755 0 0\n"
"\t\tnod dev/null 0600 0 0 c 1 5\n"
"\t\tnod dev/null 0600 0 0 c 1 3\n"
);
}
@ -445,11 +445,6 @@ int main(int argc, char *argv[])
int num_dirs = argc - optind;
argv += optind;
if (num_dirs <= 0) {
usage();
errx(1, "no directories to process?!");
}
while(num_dirs-- > 0){
char *x = strchr(*argv, '=');
if(x != 0) {