Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cc87512 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "s/master/main/" into main am: b533f531 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2772867



Change-Id: Ide151a5572106cb6e071ecdb70d97968d2a4a8a0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d38654b b533f531

libcutils/sockets_windows.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

rootdir/etc/public.libraries.android.txt

+1 −1
Original line number Diff line number Diff line 
# 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

rootdir/etc/public.libraries.iot.txt

+1 −1
Original line number Diff line number Diff line 
# 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

rootdir/etc/public.libraries.wear.txt

+1 −1
Original line number Diff line number Diff line 
# 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

trusty/stats/test/README.md

+2 −2
Original line number Diff line number Diff line 
# 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