Merge pull request #190 from Orange-OpenSource/feature/android-10-sup…

…port

android 10 support

Makefile

@@ -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 \
@@ -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 \
@@ -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 \
@@ -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)

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),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)

jni/minicap-shared/aosp/Makefile

@@ -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)
@@ -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