Merge pull request #30 from JesseCodeBones/Android_12_so_support

support Android 12 for the minicap.so building.
DeviceFarmer · Oct 13, 2021 · accda99 · accda99
2 parents 336f5aa + 0236e53
commit accda99
Show file tree

Hide file tree

Showing 3 changed files with 444 additions and 0 deletions.
diff --git a/jni/minicap-shared/aosp/Android.mk b/jni/minicap-shared/aosp/Android.mk
@@ -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)

diff --git a/jni/minicap-shared/aosp/Makefile b/jni/minicap-shared/aosp/Makefile
@@ -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)
@@ -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