ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "s/master/main/" into main am: b533f531df am: 5cc875126a am: 061a92c8ae am: fc090e5055

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

Change-Id: Ia928aae9661fb22e9b1cbc5d3269ce46be49f895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes 2023-10-05 18:15:40 +00:00 • committed by Automerger Merge Worker
commit 01a560055c
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libcutils/sockets_windows.cpp
View file

@ -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

2
rootdir/etc/public.libraries.android.txt
View file

@ -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

2
rootdir/etc/public.libraries.iot.txt
View file

@ -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

2
rootdir/etc/public.libraries.wear.txt
View file

@ -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

4
trusty/stats/test/README.md
View file

@ -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