From 716ff7b55adf56b212974ea98783422b5682251f Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 4 Oct 2023 23:31:09 +0000 Subject: [PATCH] s/master/main/ Test: treehugger Change-Id: Iabb23436d92686b934f2f2609217714b64ae75de --- libcutils/sockets_windows.cpp | 2 +- rootdir/etc/public.libraries.android.txt | 2 +- rootdir/etc/public.libraries.iot.txt | 2 +- rootdir/etc/public.libraries.wear.txt | 2 +- trusty/stats/test/README.md | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libcutils/sockets_windows.cpp b/libcutils/sockets_windows.cpp index 4adb79691..99a2e2dde 100644 --- a/libcutils/sockets_windows.cpp +++ b/libcutils/sockets_windows.cpp @@ -35,7 +35,7 @@ // can be extremely tricky and cause deadlock when using threads or atexit(). // // Both adb (1) and Chrome (2) purposefully avoid WSACleanup() with no issues. -// (1) https://android.googlesource.com/platform/system/core.git/+/master/adb/sysdeps_win32.cpp +// (1) https://android.googlesource.com/platform/packages/modules/adb.git/+/main/sysdeps_win32.cpp // (2) https://code.google.com/p/chromium/codesearch#chromium/src/net/base/winsock_init.cc bool initialize_windows_sockets() { // There's no harm in calling WSAStartup() multiple times but no benefit diff --git a/rootdir/etc/public.libraries.android.txt b/rootdir/etc/public.libraries.android.txt index cacc47c59..9be2ef69d 100644 --- a/rootdir/etc/public.libraries.android.txt +++ b/rootdir/etc/public.libraries.android.txt @@ -1,4 +1,4 @@ -# See https://android.googlesource.com/platform/ndk/+/master/docs/PlatformApis.md +# See https://android.googlesource.com/platform/ndk/+/main/docs/PlatformApis.md libandroid.so libaaudio.so libamidi.so diff --git a/rootdir/etc/public.libraries.iot.txt b/rootdir/etc/public.libraries.iot.txt index 77f8bb802..051396812 100644 --- a/rootdir/etc/public.libraries.iot.txt +++ b/rootdir/etc/public.libraries.iot.txt @@ -1,4 +1,4 @@ -# See https://android.googlesource.com/platform/ndk/+/master/docs/PlatformApis.md +# See https://android.googlesource.com/platform/ndk/+/main/docs/PlatformApis.md libandroid.so libandroidthings.so libaaudio.so diff --git a/rootdir/etc/public.libraries.wear.txt b/rootdir/etc/public.libraries.wear.txt index ea1e23437..5915dcb06 100644 --- a/rootdir/etc/public.libraries.wear.txt +++ b/rootdir/etc/public.libraries.wear.txt @@ -1,4 +1,4 @@ -# See https://android.googlesource.com/platform/ndk/+/master/docs/PlatformApis.md +# See https://android.googlesource.com/platform/ndk/+/main/docs/PlatformApis.md libandroid.so libaaudio.so libamidi.so diff --git a/trusty/stats/test/README.md b/trusty/stats/test/README.md index 45e6af8b0..175409e99 100644 --- a/trusty/stats/test/README.md +++ b/trusty/stats/test/README.md @@ -1,8 +1,8 @@ # Development Notes -* First get [repo_pull.py and gerrit.py](https://android.googlesource.com/platform/development/+/master/tools/repo_pull/) from aosp. +* First get [repo_pull.py and gerrit.py](https://android.googlesource.com/platform/development/+/main/tools/repo_pull/) from aosp. -* Although this repo is not currently in Trusty’s manifest, it’s sufficient to copy these two python scripts to the root of the Trusty project and run them from there. Make sure to follow the [repo_pull installation](https://android.googlesource.com/platform/development/+/master/tools/repo_pull/#installation) steps if necessary. +* Although this repo is not currently in Trusty’s manifest, it’s sufficient to copy these two python scripts to the root of the Trusty project and run them from there. Make sure to follow the [repo_pull installation](https://android.googlesource.com/platform/development/+/main/tools/repo_pull/#installation) steps if necessary. ## Build