Skip to content

[pull] master from openstf:master #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pull wants to merge 9 commits into
base: master
Choose a base branch
from
Open

[pull] master from openstf:master #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
88a096a
let's start from android 9 to provide android 10 support
pcrepieux Sep 4, 2019
3bcec42
To cope with API changes in the SurfaceComposer we can replace
pcrepieux Sep 4, 2019
57299f0
Fallback to getInternalDisplayToken if displayId is an unsupported value
pcrepieux Jan 15, 2020
65284e6
Prepare release with x86 support and latest fixes
pcrepieux Jan 17, 2020
393c6d3
Merge pull request #190 from Orange-OpenSource/feature/android-10-sup…
koral-- Jan 31, 2020
14ea1fe
Recover proper url and description
pcrepieux Feb 5, 2020
2d472c5
Merge pull request #203 from Orange-OpenSource/fix_package_json
koral-- Feb 5, 2020
382da25
Update README.md
koral-- Jul 13, 2020
0ee92b4
Update README.md
koral-- Aug 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ prebuilt: \
prebuilt/armeabi-v7a/lib/android-26/minicap.so \
prebuilt/armeabi-v7a/lib/android-27/minicap.so \
prebuilt/armeabi-v7a/lib/android-28/minicap.so \
prebuilt/armeabi-v7a/lib/android-29/minicap.so \
prebuilt/arm64-v8a/bin/minicap \
prebuilt/arm64-v8a/bin/minicap-nopie \
prebuilt/arm64-v8a/lib/android-21/minicap.so \
Expand All @@ -51,6 +52,7 @@ prebuilt: \
prebuilt/arm64-v8a/lib/android-26/minicap.so \
prebuilt/arm64-v8a/lib/android-27/minicap.so \
prebuilt/arm64-v8a/lib/android-28/minicap.so \
prebuilt/arm64-v8a/lib/android-29/minicap.so \
prebuilt/x86/bin/minicap \
prebuilt/x86/bin/minicap-nopie \
prebuilt/x86/lib/android-14/minicap.so \
Expand All @@ -67,6 +69,7 @@ prebuilt: \
prebuilt/x86/lib/android-26/minicap.so \
prebuilt/x86/lib/android-27/minicap.so \
prebuilt/x86/lib/android-28/minicap.so \
prebuilt/x86/lib/android-29/minicap.so \
prebuilt/x86_64/bin/minicap \
prebuilt/x86_64/bin/minicap-nopie \
prebuilt/x86_64/lib/android-21/minicap.so \
Expand All @@ -77,6 +80,7 @@ prebuilt: \
prebuilt/x86_64/lib/android-26/minicap.so \
prebuilt/x86_64/lib/android-27/minicap.so \
prebuilt/x86_64/lib/android-28/minicap.so \
prebuilt/x86_64/lib/android-29/minicap.so \

prebuilt/%/bin/minicap: libs/%/minicap
mkdir -p $(@D)
Expand Down
6 changes: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Warning

# This project along with other ones in [OpenSTF](https://github.com/openstf) organisation is provided as is for community, without active development.
# You can check any other forks that may be actively developed and offer new/different features [here](https://github.com/openstf/stf/network).
# Active development has been moved to [DeviceFarmer](https://github.com/DeviceFarmer) organisation.

# minicap

Minicap provides a socket interface for streaming realtime screen capture data out of Android devices. It is meant to be used as a component in a larger program and is therefore not immensely useful just by itself. For example, it is being used in [STF](https://github.com/openstf/stf) for remote control.
Expand Down
2 changes: 2 additions & 0 deletions jni/minicap-shared/aosp/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ LOCAL_MODULE_TAGS := optional

ifneq ($(OVERRIDE_PLATFORM_SDK_VERSION),)
LOCAL_SRC_FILES += src/minicap_$(OVERRIDE_PLATFORM_SDK_VERSION).cpp
else ifeq ($(PLATFORM_SDK_VERSION),29)
LOCAL_SRC_FILES += src/minicap_29.cpp
else ifeq ($(PLATFORM_SDK_VERSION),28)
LOCAL_SRC_FILES += src/minicap_28.cpp
else ifeq ($(PLATFORM_SDK_VERSION),27)
Expand Down
10 changes: 10 additions & 0 deletions jni/minicap-shared/aosp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ all: \
libs/android-28/arm64-v8a/minicap.so \
libs/android-28/x86/minicap.so \
libs/android-28/x86_64/minicap.so \
libs/android-29/arm64-v8a/minicap.so \

libs/android-9/armeabi-v7a/minicap.so: $(SOURCES) src/minicap_9.cpp
mkdir -p $(@D)
Expand Down Expand Up @@ -606,3 +607,12 @@ libs/android-28/mips64/minicap.so: $(SOURCES) src/minicap_28.cpp
-v $(this_dir):/app \
-v $(this_dir)$(@D):/artifacts \
openstf/aosp:jdk8 /aosp.sh build aosp_mips64-eng minicap

libs/android-29/arm64-v8a/minicap.so: $(SOURCES) src/minicap_29.cpp
mkdir -p $(@D)
docker run --rm \
-a stdout -a stderr \
-v /media/aosp/android-10.0.0_r2:/aosp \
-v $(this_dir):/app \
-v $(this_dir)$(@D):/artifacts \
openstf/aosp:jdk8 /aosp.sh build aosp_arm64-eng minicap
Binary file added jni/minicap-shared/aosp/libs/android-29/arm64-v8a/minicap.so
View file
Open in desktop
Binary file not shown.
Binary file added jni/minicap-shared/aosp/libs/android-29/armeabi-v7a/minicap.so
View file
Open in desktop
Binary file not shown.
Binary file added jni/minicap-shared/aosp/libs/android-29/x86/minicap.so
View file
Open in desktop
Binary file not shown.
Binary file added jni/minicap-shared/aosp/libs/android-29/x86_64/minicap.so
View file
Open in desktop
Binary file not shown.
Loading