Re-organize Android Gradle files (#2013)

* Re-organize Android Gradle files

Clean up our Gradle files, share versioning, etc. and prepare for
publication to sonatype.

* Use androix annotations for desktop

* Add samples as subprojects to root Gradle

* Fix build script

* Don't break when samples aren't compiled

* Better organize the Android Studio project
This commit is contained in:
Romain Guy
2020-01-07 18:37:45 -08:00
committed by GitHub
parent e09f0bb99f
commit f5d5afba74
424 changed files with 906 additions and 5274 deletions
+1 -1
View File
@@ -76,6 +76,6 @@ set(JAVA_SOURCE_FILES
add_jar(${TARGET}
SOURCES ${JAVA_SOURCE_FILES}
INCLUDE_JARS ../lib/support-annotations.jar)
INCLUDE_JARS ../lib/annotation-1.0.0.jar)
install_jar(${TARGET} lib)
+1 -1
View File
@@ -156,6 +156,6 @@ set(JAVA_SOURCE_FILES
add_jar(${TARGET}
SOURCES ${JAVA_SOURCE_FILES}
INCLUDE_JARS ../lib/support-annotations.jar)
INCLUDE_JARS ../lib/annotation-1.0.0.jar)
install_jar(${TARGET} lib)
@@ -23,7 +23,7 @@ import com.google.android.filament.Engine;
import com.google.android.filament.SwapChain;
import com.google.android.filament.View;
import com.google.android.filament.Renderer;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
public class FilamentCanvas extends Canvas implements FilamentTarget {
private SwapChain mSwapChain;
@@ -28,7 +28,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ExecutorService;
import java.nio.ByteBuffer;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
/**
@@ -16,7 +16,7 @@
package com.google.android.filament;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
public interface FilamentTarget {
boolean beginFrame(Engine engine, Renderer renderer);
Binary file not shown.
Binary file not shown.