Merge branch 'master' into dev
This commit is contained in:
commit
da63e3774b
3 changed files with 21 additions and 8 deletions
13
BUILD.md
13
BUILD.md
|
@ -176,8 +176,8 @@ Additionally, if you want to build the server, install Java 8 from Caskroom, and
|
||||||
make it avaliable from the `PATH`:
|
make it avaliable from the `PATH`:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
brew tap caskroom/versions
|
brew tap homebrew/cask-versions
|
||||||
brew cask install java8
|
brew cask install adoptopenjdk/openjdk/adoptopenjdk8
|
||||||
export JAVA_HOME="$(/usr/libexec/java_home --version 1.8)"
|
export JAVA_HOME="$(/usr/libexec/java_home --version 1.8)"
|
||||||
export PATH="$JAVA_HOME/bin:$PATH"
|
export PATH="$JAVA_HOME/bin:$PATH"
|
||||||
```
|
```
|
||||||
|
@ -190,12 +190,17 @@ See [pierlon/scrcpy-docker](https://github.com/pierlon/scrcpy-docker).
|
||||||
## Common steps
|
## Common steps
|
||||||
|
|
||||||
If you want to build the server, install the [Android SDK] (_Android Studio_),
|
If you want to build the server, install the [Android SDK] (_Android Studio_),
|
||||||
and set `ANDROID_HOME` to its directory. For example:
|
and set `ANDROID_SDK_ROOT` to its directory. For example:
|
||||||
|
|
||||||
[Android SDK]: https://developer.android.com/studio/index.html
|
[Android SDK]: https://developer.android.com/studio/index.html
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
export ANDROID_HOME=~/android/sdk
|
# Linux
|
||||||
|
export ANDROID_SDK_ROOT=~/Android/Sdk
|
||||||
|
# Mac
|
||||||
|
export ANDROID_SDK_ROOT=~/Library/Android/sdk
|
||||||
|
# Windows
|
||||||
|
set ANDROID_SDK_ROOT=%LOCALAPPDATA%\Android\sdk
|
||||||
```
|
```
|
||||||
|
|
||||||
If you don't want to build the server, use the [prebuilt server].
|
If you don't want to build the server, use the [prebuilt server].
|
||||||
|
|
13
README.md
13
README.md
|
@ -49,6 +49,11 @@ A [Snap] package is available: [`scrcpy`][snap-link].
|
||||||
|
|
||||||
[snap]: https://en.wikipedia.org/wiki/Snappy_(package_manager)
|
[snap]: https://en.wikipedia.org/wiki/Snappy_(package_manager)
|
||||||
|
|
||||||
|
For Fedora, a [COPR] package is available: [`scrcpy`][copr-link].
|
||||||
|
|
||||||
|
[COPR]: https://fedoraproject.org/wiki/Category:Copr
|
||||||
|
[copr-link]: https://copr.fedorainfracloud.org/coprs/zeno/scrcpy/
|
||||||
|
|
||||||
For Arch Linux, an [AUR] package is available: [`scrcpy`][aur-link].
|
For Arch Linux, an [AUR] package is available: [`scrcpy`][aur-link].
|
||||||
|
|
||||||
[AUR]: https://wiki.archlinux.org/index.php/Arch_User_Repository
|
[AUR]: https://wiki.archlinux.org/index.php/Arch_User_Repository
|
||||||
|
@ -301,7 +306,7 @@ ssh -CN -L5037:localhost:5037 -L27183:localhost:27183 your_remote_computer
|
||||||
From another terminal:
|
From another terminal:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
scrcpy --force-adb-forwrad
|
scrcpy --force-adb-forward
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
@ -447,7 +452,7 @@ On Android, the `POWER` button always turns the screen on. For convenience, if
|
||||||
will force to turn the screen off after a small delay (on a best effort basis).
|
will force to turn the screen off after a small delay (on a best effort basis).
|
||||||
The physical `POWER` button will still cause the screen to be turned on.
|
The physical `POWER` button will still cause the screen to be turned on.
|
||||||
|
|
||||||
It can be useful to also prevent the device to sleep:
|
It can also be useful to prevent the device from sleeping:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
scrcpy --turn-screen-off --stay-awake
|
scrcpy --turn-screen-off --stay-awake
|
||||||
|
@ -600,11 +605,11 @@ scrcpy --push-target /sdcard/foo/bar/
|
||||||
|
|
||||||
### Audio forwarding
|
### Audio forwarding
|
||||||
|
|
||||||
Audio is not forwarded by _scrcpy_. Use [USBaudio] (Linux-only).
|
Audio is not forwarded by _scrcpy_. Use [sndcpy].
|
||||||
|
|
||||||
Also see [issue #14].
|
Also see [issue #14].
|
||||||
|
|
||||||
[USBaudio]: https://github.com/rom1v/usbaudio
|
[sndcpy]: https://github.com/rom1v/sndcpy
|
||||||
[issue #14]: https://github.com/Genymobile/scrcpy/issues/14
|
[issue #14]: https://github.com/Genymobile/scrcpy/issues/14
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -42,6 +42,8 @@ echo "Generating java from aidl..."
|
||||||
cd "$SERVER_DIR/src/main/aidl"
|
cd "$SERVER_DIR/src/main/aidl"
|
||||||
"$ANDROID_HOME/build-tools/$BUILD_TOOLS/aidl" -o"$CLASSES_DIR" \
|
"$ANDROID_HOME/build-tools/$BUILD_TOOLS/aidl" -o"$CLASSES_DIR" \
|
||||||
android/view/IRotationWatcher.aidl
|
android/view/IRotationWatcher.aidl
|
||||||
|
"$ANDROID_HOME/build-tools/$BUILD_TOOLS/aidl" -o"$CLASSES_DIR" \
|
||||||
|
android/content/IOnPrimaryClipChangedListener.aidl
|
||||||
|
|
||||||
echo "Compiling java sources..."
|
echo "Compiling java sources..."
|
||||||
cd ../java
|
cd ../java
|
||||||
|
@ -55,6 +57,7 @@ cd "$CLASSES_DIR"
|
||||||
"$ANDROID_HOME/build-tools/$BUILD_TOOLS/dx" --dex \
|
"$ANDROID_HOME/build-tools/$BUILD_TOOLS/dx" --dex \
|
||||||
--output "$BUILD_DIR/classes.dex" \
|
--output "$BUILD_DIR/classes.dex" \
|
||||||
android/view/*.class \
|
android/view/*.class \
|
||||||
|
android/content/*.class \
|
||||||
com/genymobile/scrcpy/*.class \
|
com/genymobile/scrcpy/*.class \
|
||||||
com/genymobile/scrcpy/wrappers/*.class
|
com/genymobile/scrcpy/wrappers/*.class
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue