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

support Android 12 for the minicap.so building. #30

Merged
merged 2 commits into from
Oct 13, 2021
Merged

support Android 12 for the minicap.so building. #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eba5a1f
support Android 12 for the minicap.so building.
JesseCodeBones Oct 12, 2021
0236e53
update main Make file for Android 12 building.
JesseCodeBones Oct 13, 2021
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),31)
LOCAL_SRC_FILES += src/minicap_31.cpp
else ifeq ($(PLATFORM_SDK_VERSION),30)
LOCAL_SRC_FILES += src/minicap_30.cpp
else ifeq ($(PLATFORM_SDK_VERSION),29)
Expand Down
40 changes: 40 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 @@ -49,6 +49,10 @@ all: \
libs/android-28/x86/minicap.so \
libs/android-28/x86_64/minicap.so \
libs/android-29/arm64-v8a/minicap.so \
libs/android-31/armeabi-v7a/minicap.so \
libs/android-31/arm64-v8a/minicap.so \
libs/android-31/x86/minicap.so \
libs/android-31/x86_64/minicap.so \

libs/android-9/armeabi-v7a/minicap.so: $(SOURCES) src/minicap_9.cpp
mkdir -p $(@D)
Expand Down Expand Up @@ -616,3 +620,39 @@ libs/android-29/arm64-v8a/minicap.so: $(SOURCES) src/minicap_29.cpp
-v $(this_dir):/app \
-v $(this_dir)$(@D):/artifacts \
openstf/aosp:jdk8 /aosp.sh build aosp_arm64-eng minicap

libs/android-31/armeabi-v7a/minicap.so: $(SOURCES) src/minicap_31.cpp
mkdir -p $(@D)
docker run --rm \
-a stdout -a stderr \
-v /media/aosp/android-12.0.0_r2:/aosp \
-v $(this_dir):/app \
-v $(this_dir)$(@D):/artifacts \
openstf/aosp:jdk8 /aosp.sh build aosp_arm-eng minicap

libs/android-31/arm64-v8a/minicap.so: $(SOURCES) src/minicap_31.cpp
mkdir -p $(@D)
docker run --rm \
-a stdout -a stderr \
-v /media/aosp/android-12.0.0_r2:/aosp \
-v $(this_dir):/app \
-v $(this_dir)$(@D):/artifacts \
openstf/aosp:jdk8 /aosp.sh build aosp_arm64-eng minicap

libs/android-31/x86/minicap.so: $(SOURCES) src/minicap_31.cpp
mkdir -p $(@D)
docker run --rm \
-a stdout -a stderr \
-v /media/aosp/android-12.0.0_r2:/aosp \
-v $(this_dir):/app \
-v $(this_dir)$(@D):/artifacts \
openstf/aosp:jdk8 /aosp.sh build aosp_x86-eng minicap

libs/android-31/x86_64/minicap.so: $(SOURCES) src/minicap_31.cpp
mkdir -p $(@D)
docker run --rm \
-a stdout -a stderr \
-v /media/aosp/android-12.0.0_r2:/aosp \
-v $(this_dir):/app \
-v $(this_dir)$(@D):/artifacts \
openstf/aosp:jdk8 /aosp.sh build aosp_x86_64-eng minicap
Loading