Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ plugins {

android {
namespace = "com.meta.usbvideo"
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.meta.usbvideo"
minSdk = 30
targetSdk = 34
minSdk = 33
targetSdk = 35
versionCode = 1
versionName = "1.0"

Expand All @@ -44,11 +44,11 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "17"
}
externalNativeBuild {
cmake {
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,9 @@ limitations under the License.
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.meta.usbvideo"
xmlns:tools="http://schemas.android.com/tools"
>

<uses-sdk
android:minSdkVersion="30"
android:targetSdkVersion="34"
/>

<uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.CAMERA"/>
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ set(CMAKE_CXX_STANDARD 20)
# build script scope).
project("usbvideo")

# 16 KB page size compatibility for Android 15+ (API 35+)
add_link_options(-Wl,-z,max-page-size=16384)

add_subdirectory(libusb)
add_subdirectory(libuvc)
add_subdirectory(libyuv)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/cpp/RingBuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ class RingBuffer {
std::unique_ptr<T[]> buffer_;
};

typedef RingBuffer<uint16_t> RingBufferPcm;
using RingBufferPcm = RingBuffer<uint16_t>;
Loading
Loading