Revert "Convert Skottie build instructions to build an Android Library (AAR) instead of app (APK)"

This reverts commit dff4d584ed.

Reason for revert: breaking the google3 roll

Change-Id: I0e26c77e9bad0f48bc726d3b63a97d5aa7fa51ac
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/297190
Reviewed-by: Derek Sollenberger <djsollen@google.com>

.gitignore

@@ -26,7 +26,6 @@ platform_tools/android/apps/build
 platform_tools/android/apps/*.properties
 platform_tools/android/apps/*/build
 platform_tools/android/apps/*/src/main/libs
-platform_tools/android/apps/*/*/src/main/libs
 platform_tools/android/apps/*.hprof
 platform_tools/android/apps/*/.externalNativeBuild
 

BUILD.gn

@@ -2134,7 +2134,8 @@ if (skia_enable_tools) {
     test_app("skottie_android") {
       is_shared_library = true
 
-      sources = [ "platform_tools/android/apps/skottie/skottielib/src/main/cpp/native-lib.cpp" ]
+      sources =
+          [ "platform_tools/android/apps/skottie/src/main/cpp/native-lib.cpp" ]
       libs = []
 
       deps = [

infra/bots/compile.isolate

@@ -25,7 +25,7 @@
       '../../gn',
       '../../include',
       '../../modules',
-      '../../platform_tools/android/apps/skottie/skottielib/src/main/cpp/native-lib.cpp',
+      '../../platform_tools/android/apps/skottie/src/main/cpp/native-lib.cpp',
       '../../platform_tools/android/launcher/skia_launcher.cpp',
       '../../platform_tools/android/vulkan/Skia_Vulkan_Android.h',
       '../../platform_tools/ios/app/LaunchScreen.storyboard',

platform_tools/android/apps/settings.gradle

@@ -2,4 +2,3 @@ include ':viewer'
 include ':skqp'
 include ':skar_java'
 include ':skottie'
-include ':skottie:skottielib'

platform_tools/android/apps/skottie/build.gradle

@@ -7,20 +7,21 @@
 apply plugin: 'com.android.application'
 
 dependencies {
-    implementation project("skottielib")
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.android.support:support-v13:23.3.0'
+    implementation 'com.android.support:appcompat-v7:23.3.0'
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 23
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
     flavorDimensions "tier"
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 28
+        applicationId "org.skia.skottie"
+        minSdkVersion 23
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
         signingConfig signingConfigs.debug
@@ -28,15 +29,7 @@ android {
     flavorDimensions "base"
     sourceSets.main.jni.srcDirs = [] //disable automatic ndk-build call
     sourceSets.main.jniLibs.srcDir "src/main/libs"
+    productFlavors { universal{}; arm {}; arm64 {}; x86 {}; x64 {}; arm64vulkan{}; }
 
-    //    When building from Android Studio, ensure that local variables are set:
-    //    sdk.dir=[sdk file path]
-    //    depot_tools.dir=[depot tools file path]
-    //    x86.out.dir=[out file for x86]
-    //    x64.out.dir=[out file for x64]
-    //    arm64.out.dir=[out file for xarm64]
-    //    arm.out.dir=[out file for arm]
-
-    productFlavors { arm {}; arm64 {}; x86 {}; x64 {}; arm64vulkan{}; }
-
+    setupSkiaLibraryBuild(project, applicationVariants, "libskottie_android")
 }

platform_tools/android/apps/skottie/skottielib/.gitignore

@@ -1 +0,0 @@
-/build

platform_tools/android/apps/skottie/skottielib/build.gradle

@@ -1,36 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 29
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    buildToolsVersion "29.0.3"
-
-    defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
-    }
-
-    //    When building from Android Studio, ensure that local variables are set:
-    //    sdk.dir=[sdk file path]
-    //    depot_tools.dir=[depot tools file path]
-    //    x86.out.dir=[out file for x86]
-    //    x64.out.dir=[out file for x64]
-    //    arm64.out.dir=[out file for xarm64]
-    //    arm.out.dir=[out file for arm]
-
-    sourceSets.main.jniLibs.srcDir "src/main/libs"
-    flavorDimensions "base"
-    productFlavors { arm {}; arm64 {}; x86 {}; x64 {}; arm64vulkan{}; }
-    setupSkiaLibraryBuild(project, libraryVariants, "libskottie_android")
-
-}
-
-dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-
-}

platform_tools/android/apps/skottie/skottielib/src/main/AndroidManifest.xml

@@ -1,2 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.skia.skottielib" />

platform_tools/android/apps/skottie/src/main/java/org/skia/skottie/SkottieAnimation.java

@@ -1,7 +1,7 @@
 package org.skia.skottie;
 
 import android.graphics.drawable.Animatable;
-import androidx.annotation.FloatRange;
+import android.support.annotation.FloatRange;
 
 public interface SkottieAnimation extends Animatable {
     /**