diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3c9b90dfa7f3..d8bb7bffddbc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -294,7 +294,6 @@ jobs:
       run: echo "::set-output name=hashes::$(shasum -a 256 Mac.flatc.binary.zip | base64)"
 
   build-android:
-   if: false
    name: Build Android (on Linux)
    runs-on: ubuntu-latest
    steps:
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7497179f9d77..dd02cd6b1805 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -18,6 +18,14 @@ android {
       targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    sourceSets {
+      main {
+        java {
+          srcDir '../../java'
+        }
+      }
+    }
+
     ndk {
       abiFilters 'arm64-v8a', 'armeabi-v7a'
     }
@@ -105,30 +113,6 @@ android {
       dependsOn(generateFbsCpp)
     }
   }
-
-//  flavorDimensions "stl-variant"
-//  productFlavors {
-//    gnustl {
-//      dimension "stl-variant"
-//      applicationIdSuffix ".gnustl"
-//      versionNameSuffix "-gnustl"
-//      externalNativeBuild {
-//        ndkBuild {
-//          arguments "APP_STL=gnustl_static"
-//        }
-//      }
-//    }
-//    libcpp {
-//      dimension "stl-variant"
-//      applicationIdSuffix ".libcpp"
-//      versionNameSuffix "-libcpp"
-//      externalNativeBuild {
-//        ndkBuild {
-//          arguments "APP_STL=c++_static"
-//        }
-//      }
-//    }
-//  }
 }
 
 dependencies {
@@ -136,6 +120,8 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation 'androidx.core:core-ktx:1.3.2'
   implementation 'androidx.appcompat:appcompat:1.2.0'
-  implementation 'com.google.flatbuffers:flatbuffers-java:2.0.0'
+
+  // If you using java runtime you can add its dependency as the example below
+  // implementation 'com.google.flatbuffers:flatbuffers-java:$latest_version'
 
 }