diff --git a/Android.mk b/Android.mk index 0942ffc..ddd89f0 100644 --- a/Android.mk +++ b/Android.mk @@ -68,8 +68,7 @@ endef # NDK libs ndk_libs_cxx := libc++_shared -ndk_libs_media := libcamera2ndk libandroid libmediandk -libs := $(ndk_libs_cxx) $(ndk_libs_media) +libs := $(ndk_libs_cxx) $(foreach lib,$(libs),\ $(eval $(call define-redroid-prebuilt-lib,$(lib)_p,$(lib).so,$(lib).so))) @@ -102,8 +101,6 @@ expat_libs := libexpat.so.1 libs = $(gbm_libs) $(glapi_libs) $(expat_libs) drm_libs := $(shell cd $(LOCAL_PATH)/prebuilts/$(TARGET_ARCH)/lib && find * -name 'libdrm*.so.*' -type l) libs += $(drm_libs) -x264_libs := libx264.so.164 -libs += $(x264_libs) $(foreach lib,$(libs),\ $(eval $(call define-redroid-prebuilt-lib,$(lib),$(lib)))) @@ -157,7 +154,7 @@ $(eval $(call define-redroid-prebuilt-lib,hwcomposer.redroid,,hw/hwcomposer.redr ## libOmxCore -$(eval $(call define-redroid-prebuilt-lib,libOmxCore,,libOmxCore.so, , ,$(va_libs) $(ffmpeg_libs) $(x264_libs))) +$(eval $(call define-redroid-prebuilt-lib,libOmxCore,,libOmxCore.so, , ,$(va_libs) )) ## libevdev @@ -195,11 +192,6 @@ bins:=avcenc h264encode hevcencode jpegenc vp8enc vp9enc vainfo $(foreach i,$(bins),\ $(eval $(call define-redroid-prebuilt-bin,$(i),$(va_libs)))) -# ffmpeg -bins:=ffmpeg ffprobe -$(foreach i,$(bins),\ - $(eval $(call define-redroid-prebuilt-bin,$(i),$(ffmpeg_libs)))) - $(eval $(call define-redroid-prebuilt-bin,uinputd,$(evdev_libs),uinputd/uinputd.rc)) $(eval $(call define-redroid-prebuilt-bin,vncserver,$(vncserver_libs),vncserver/vncserver.rc)) diff --git a/prebuilts/aarch64/bin/ffmpeg b/prebuilts/aarch64/bin/ffmpeg deleted file mode 100755 index 56eb6f6..0000000 Binary files a/prebuilts/aarch64/bin/ffmpeg and /dev/null differ diff --git a/prebuilts/aarch64/bin/ffprobe b/prebuilts/aarch64/bin/ffprobe deleted file mode 100755 index 3e21c00..0000000 Binary files a/prebuilts/aarch64/bin/ffprobe and /dev/null differ diff --git a/prebuilts/aarch64/bin/x264 b/prebuilts/aarch64/bin/x264 deleted file mode 100755 index 933bbc6..0000000 Binary files a/prebuilts/aarch64/bin/x264 and /dev/null differ diff --git a/prebuilts/aarch64/lib/libOmxCore.so b/prebuilts/aarch64/lib/libOmxCore.so index d6eddcc..75e6903 100755 Binary files a/prebuilts/aarch64/lib/libOmxCore.so and b/prebuilts/aarch64/lib/libOmxCore.so differ diff --git a/prebuilts/aarch64/lib/libavcodec.so b/prebuilts/aarch64/lib/libavcodec.so deleted file mode 100755 index 569dfe5..0000000 Binary files a/prebuilts/aarch64/lib/libavcodec.so and /dev/null differ diff --git a/prebuilts/aarch64/lib/libavdevice.so b/prebuilts/aarch64/lib/libavdevice.so deleted file mode 100755 index 311f88a..0000000 Binary files a/prebuilts/aarch64/lib/libavdevice.so and /dev/null differ diff --git a/prebuilts/aarch64/lib/libavfilter.so b/prebuilts/aarch64/lib/libavfilter.so deleted file mode 100755 index 5d87c4a..0000000 Binary files a/prebuilts/aarch64/lib/libavfilter.so and /dev/null differ diff --git a/prebuilts/aarch64/lib/libavformat.so b/prebuilts/aarch64/lib/libavformat.so deleted file mode 100755 index aaa2f11..0000000 Binary files a/prebuilts/aarch64/lib/libavformat.so and /dev/null differ diff --git a/prebuilts/aarch64/lib/libavutil.so b/prebuilts/aarch64/lib/libavutil.so deleted file mode 100755 index f8a5b35..0000000 Binary files a/prebuilts/aarch64/lib/libavutil.so and /dev/null differ diff --git a/prebuilts/aarch64/lib/libpostproc.so b/prebuilts/aarch64/lib/libpostproc.so deleted file mode 100755 index 9479be5..0000000 Binary files a/prebuilts/aarch64/lib/libpostproc.so and /dev/null differ diff --git a/prebuilts/aarch64/lib/libswresample.so b/prebuilts/aarch64/lib/libswresample.so deleted file mode 100755 index e7c5f99..0000000 Binary files a/prebuilts/aarch64/lib/libswresample.so and /dev/null differ diff --git a/prebuilts/aarch64/lib/libswscale.so b/prebuilts/aarch64/lib/libswscale.so deleted file mode 100755 index 480b2e0..0000000 Binary files a/prebuilts/aarch64/lib/libswscale.so and /dev/null differ diff --git a/prebuilts/aarch64/lib/libx264.so b/prebuilts/aarch64/lib/libx264.so deleted file mode 120000 index b884d16..0000000 --- a/prebuilts/aarch64/lib/libx264.so +++ /dev/null @@ -1 +0,0 @@ -libx264.so.164 \ No newline at end of file diff --git a/prebuilts/aarch64/lib/libx264.so.164 b/prebuilts/aarch64/lib/libx264.so.164 deleted file mode 100755 index efa7126..0000000 Binary files a/prebuilts/aarch64/lib/libx264.so.164 and /dev/null differ diff --git a/prebuilts/arm/lib/libOmxCore.so b/prebuilts/arm/lib/libOmxCore.so index 5f08076..370bc95 100755 Binary files a/prebuilts/arm/lib/libOmxCore.so and b/prebuilts/arm/lib/libOmxCore.so differ diff --git a/prebuilts/arm/lib/libavcodec.so b/prebuilts/arm/lib/libavcodec.so deleted file mode 100755 index 5d71b4b..0000000 Binary files a/prebuilts/arm/lib/libavcodec.so and /dev/null differ diff --git a/prebuilts/arm/lib/libavdevice.so b/prebuilts/arm/lib/libavdevice.so deleted file mode 100755 index 7c65fc4..0000000 Binary files a/prebuilts/arm/lib/libavdevice.so and /dev/null differ diff --git a/prebuilts/arm/lib/libavfilter.so b/prebuilts/arm/lib/libavfilter.so deleted file mode 100755 index 8bf2d8d..0000000 Binary files a/prebuilts/arm/lib/libavfilter.so and /dev/null differ diff --git a/prebuilts/arm/lib/libavformat.so b/prebuilts/arm/lib/libavformat.so deleted file mode 100755 index 52cb77a..0000000 Binary files a/prebuilts/arm/lib/libavformat.so and /dev/null differ diff --git a/prebuilts/arm/lib/libavutil.so b/prebuilts/arm/lib/libavutil.so deleted file mode 100755 index 1e84ff0..0000000 Binary files a/prebuilts/arm/lib/libavutil.so and /dev/null differ diff --git a/prebuilts/arm/lib/libpostproc.so b/prebuilts/arm/lib/libpostproc.so deleted file mode 100755 index 076ab17..0000000 Binary files a/prebuilts/arm/lib/libpostproc.so and /dev/null differ diff --git a/prebuilts/arm/lib/libswresample.so b/prebuilts/arm/lib/libswresample.so deleted file mode 100755 index 8e18613..0000000 Binary files a/prebuilts/arm/lib/libswresample.so and /dev/null differ diff --git a/prebuilts/arm/lib/libswscale.so b/prebuilts/arm/lib/libswscale.so deleted file mode 100755 index cf38c7d..0000000 Binary files a/prebuilts/arm/lib/libswscale.so and /dev/null differ diff --git a/prebuilts/arm/lib/libx264.so b/prebuilts/arm/lib/libx264.so deleted file mode 120000 index b884d16..0000000 --- a/prebuilts/arm/lib/libx264.so +++ /dev/null @@ -1 +0,0 @@ -libx264.so.164 \ No newline at end of file diff --git a/prebuilts/arm/lib/libx264.so.164 b/prebuilts/arm/lib/libx264.so.164 deleted file mode 100755 index 2072901..0000000 Binary files a/prebuilts/arm/lib/libx264.so.164 and /dev/null differ diff --git a/prebuilts/x86/lib/libOmxCore.so b/prebuilts/x86/lib/libOmxCore.so index c42d9b8..7631235 100755 Binary files a/prebuilts/x86/lib/libOmxCore.so and b/prebuilts/x86/lib/libOmxCore.so differ diff --git a/prebuilts/x86/lib/libavcodec.so b/prebuilts/x86/lib/libavcodec.so deleted file mode 100755 index 156ea45..0000000 Binary files a/prebuilts/x86/lib/libavcodec.so and /dev/null differ diff --git a/prebuilts/x86/lib/libavdevice.so b/prebuilts/x86/lib/libavdevice.so deleted file mode 100755 index ff69744..0000000 Binary files a/prebuilts/x86/lib/libavdevice.so and /dev/null differ diff --git a/prebuilts/x86/lib/libavfilter.so b/prebuilts/x86/lib/libavfilter.so deleted file mode 100755 index c0cfc8e..0000000 Binary files a/prebuilts/x86/lib/libavfilter.so and /dev/null differ diff --git a/prebuilts/x86/lib/libavformat.so b/prebuilts/x86/lib/libavformat.so deleted file mode 100755 index 5bcb0a3..0000000 Binary files a/prebuilts/x86/lib/libavformat.so and /dev/null differ diff --git a/prebuilts/x86/lib/libavutil.so b/prebuilts/x86/lib/libavutil.so deleted file mode 100755 index ffb1fd9..0000000 Binary files a/prebuilts/x86/lib/libavutil.so and /dev/null differ diff --git a/prebuilts/x86/lib/libpostproc.so b/prebuilts/x86/lib/libpostproc.so deleted file mode 100755 index 8961c15..0000000 Binary files a/prebuilts/x86/lib/libpostproc.so and /dev/null differ diff --git a/prebuilts/x86/lib/libswresample.so b/prebuilts/x86/lib/libswresample.so deleted file mode 100755 index 8aea224..0000000 Binary files a/prebuilts/x86/lib/libswresample.so and /dev/null differ diff --git a/prebuilts/x86/lib/libswscale.so b/prebuilts/x86/lib/libswscale.so deleted file mode 100755 index 9268ed0..0000000 Binary files a/prebuilts/x86/lib/libswscale.so and /dev/null differ diff --git a/prebuilts/x86/lib/libx264.so b/prebuilts/x86/lib/libx264.so deleted file mode 120000 index b884d16..0000000 --- a/prebuilts/x86/lib/libx264.so +++ /dev/null @@ -1 +0,0 @@ -libx264.so.164 \ No newline at end of file diff --git a/prebuilts/x86/lib/libx264.so.164 b/prebuilts/x86/lib/libx264.so.164 deleted file mode 100755 index 668ce0a..0000000 Binary files a/prebuilts/x86/lib/libx264.so.164 and /dev/null differ diff --git a/prebuilts/x86_64/bin/ffmpeg b/prebuilts/x86_64/bin/ffmpeg deleted file mode 100755 index fcb0f04..0000000 Binary files a/prebuilts/x86_64/bin/ffmpeg and /dev/null differ diff --git a/prebuilts/x86_64/bin/ffprobe b/prebuilts/x86_64/bin/ffprobe deleted file mode 100755 index eb11c57..0000000 Binary files a/prebuilts/x86_64/bin/ffprobe and /dev/null differ diff --git a/prebuilts/x86_64/bin/x264 b/prebuilts/x86_64/bin/x264 deleted file mode 100755 index 3c5ebca..0000000 Binary files a/prebuilts/x86_64/bin/x264 and /dev/null differ diff --git a/prebuilts/x86_64/lib/libOmxCore.so b/prebuilts/x86_64/lib/libOmxCore.so index 740072c..c7e6e78 100755 Binary files a/prebuilts/x86_64/lib/libOmxCore.so and b/prebuilts/x86_64/lib/libOmxCore.so differ diff --git a/prebuilts/x86_64/lib/libavcodec.so b/prebuilts/x86_64/lib/libavcodec.so deleted file mode 100755 index 7456f84..0000000 Binary files a/prebuilts/x86_64/lib/libavcodec.so and /dev/null differ diff --git a/prebuilts/x86_64/lib/libavdevice.so b/prebuilts/x86_64/lib/libavdevice.so deleted file mode 100755 index 23fade6..0000000 Binary files a/prebuilts/x86_64/lib/libavdevice.so and /dev/null differ diff --git a/prebuilts/x86_64/lib/libavfilter.so b/prebuilts/x86_64/lib/libavfilter.so deleted file mode 100755 index 75f03aa..0000000 Binary files a/prebuilts/x86_64/lib/libavfilter.so and /dev/null differ diff --git a/prebuilts/x86_64/lib/libavformat.so b/prebuilts/x86_64/lib/libavformat.so deleted file mode 100755 index 52a83de..0000000 Binary files a/prebuilts/x86_64/lib/libavformat.so and /dev/null differ diff --git a/prebuilts/x86_64/lib/libavutil.so b/prebuilts/x86_64/lib/libavutil.so deleted file mode 100755 index 61ff95c..0000000 Binary files a/prebuilts/x86_64/lib/libavutil.so and /dev/null differ diff --git a/prebuilts/x86_64/lib/libpostproc.so b/prebuilts/x86_64/lib/libpostproc.so deleted file mode 100755 index b0f1eed..0000000 Binary files a/prebuilts/x86_64/lib/libpostproc.so and /dev/null differ diff --git a/prebuilts/x86_64/lib/libswresample.so b/prebuilts/x86_64/lib/libswresample.so deleted file mode 100755 index 32cda87..0000000 Binary files a/prebuilts/x86_64/lib/libswresample.so and /dev/null differ diff --git a/prebuilts/x86_64/lib/libswscale.so b/prebuilts/x86_64/lib/libswscale.so deleted file mode 100755 index 58371eb..0000000 Binary files a/prebuilts/x86_64/lib/libswscale.so and /dev/null differ diff --git a/prebuilts/x86_64/lib/libx264.so b/prebuilts/x86_64/lib/libx264.so deleted file mode 120000 index b884d16..0000000 --- a/prebuilts/x86_64/lib/libx264.so +++ /dev/null @@ -1 +0,0 @@ -libx264.so.164 \ No newline at end of file diff --git a/prebuilts/x86_64/lib/libx264.so.164 b/prebuilts/x86_64/lib/libx264.so.164 deleted file mode 100755 index da46340..0000000 Binary files a/prebuilts/x86_64/lib/libx264.so.164 and /dev/null differ