pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "s/master/main/" into main

This commit is contained in:
Elliott Hughes 2023-10-05 16:09:46 +00:00 committed by Gerrit Code Review
parent 743c4cdb1c 716ff7b55a
commit b533f531df
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(). // can be extremely tricky and cause deadlock when using threads or atexit().
// //
// Both adb (1) and Chrome (2) purposefully avoid WSACleanup() with no issues. // 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 // (2) https://code.google.com/p/chromium/codesearch#chromium/src/net/base/winsock_init.cc
bool initialize_windows_sockets() { bool initialize_windows_sockets() {
// There's no harm in calling WSAStartup() multiple times but no benefit // 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 libandroid.so
libaaudio.so libaaudio.so
libamidi.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 libandroid.so
libandroidthings.so libandroidthings.so
libaaudio.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 libandroid.so
libaaudio.so libaaudio.so
libamidi.so libamidi.so

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

@ -1,8 +1,8 @@
# Development Notes # 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 ## Build