Update emulator to 29.3.4

pull/741/head
Mattia Iavarone 6 years ago
parent 96f6a20f6c
commit 7cf5bcd2aa
  1. 2
      .github/workflows/build.yml
  2. 4
      cameraview/build.gradle
  3. 5
      cameraview/src/main/java/com/otaliastudios/cameraview/internal/DeviceEncoders.java

@ -72,7 +72,7 @@ jobs:
disable-animations: true
profile: Nexus 5X
emulator-options: -no-snapshot -no-window -no-boot-anim -camera-back emulated -camera-front emulated -gpu swiftshader_indirect
emulator-build: 6031357
emulator-build: 611007
script: ./.github/workflows/emulator_script.sh
- name: Upload emulator tests artifact
uses: actions/upload-artifact@v1

@ -145,7 +145,7 @@ bintray {
// From official sample https://github.com/bintray/bintray-examples/blob/master/gradle-aar-example/build.gradle
task sourcesJar(type: Jar) {
classifier = 'sources'
archiveClassifier.set('sources')
from android.sourceSets.main.java.sourceFiles
}
@ -167,7 +167,7 @@ task javadoc(type: Javadoc) {
}
task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
archiveClassifier.set('javadoc')
from javadoc.destinationDir
}

@ -197,10 +197,7 @@ public class DeviceEncoders {
public int compare(MediaCodecInfo o1, MediaCodecInfo o2) {
boolean hw1 = isHardwareEncoder(o1.getName());
boolean hw2 = isHardwareEncoder(o2.getName());
if (hw1 && hw2) return 0;
if (hw1) return -1;
if (hw2) return 1;
return 0;
return Boolean.compare(hw2, hw1);
}
});
}

Loading…
Cancel
Save