Skip to content
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

android 10 support #190

Merged
merged 4 commits into from
Jan 31, 2020
Merged

android 10 support #190

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 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
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
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.
Loading