disable prefab based builds in main branch.

atsushieno · Dec 11, 2020 · f1c9362 · f1c9362
1 parent cc0cddd
commit f1c9362
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/java/androidaudioplugin/build.gradle b/java/androidaudioplugin/build.gradle
@@ -51,23 +51,26 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    // FIXME: PREFAB: enable these sections once we migrate to prefab-based solution.
+    /*
     buildFeatures {
         prefabPublishing true
     }
     // Workaround for https://issuetracker.google.com/issues/168777344#comment5
     packagingOptions {
         exclude '**.so'
     }
-    // WARNING: It's not working https://github.com/atsushieno/android-audio-plugin-framework/issues/57
     prefab {
         androidaudioplugin {
             name 'androidaudioplugin'
+            // WARNING: It's not working https://github.com/atsushieno/android-audio-plugin-framework/issues/57
             // There is no way to specify more than one include directory.
             // headers '../../native/androidaudioplugin/android/include'
             // FIXME: remove this dummy headers dir hack once https://issuetracker.google.com/issues/172105145 is supported.
             headers '../../dummy-prefab-headers/include'
         }
     }
+    */
 }
 
 afterEvaluate {

diff --git a/java/samples/aapbarebonepluginsample/CMakeLists.txt b/java/samples/aapbarebonepluginsample/CMakeLists.txt
@@ -42,7 +42,7 @@ target_compile_options(aapbarebonepluginsample
         -Wshadow-field
         )
 
-if (TRUE)
+if (BUILD_WITH_PREFAB)
 if (ANDROID)
     find_package (androidaudioplugin REQUIRED CONFIG)
     set (aapbarebonepluginsample_LIBS

diff --git a/java/samples/aapbarebonepluginsample/build.gradle b/java/samples/aapbarebonepluginsample/build.gradle
@@ -21,9 +21,12 @@ android {
             }
         }
     }
+    // FIXME: PREFAB: enable these sections once we migrate to prefab-based solution.
+    /*
     buildFeatures {
         prefab true
     }
+    */
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"

diff --git a/java/samples/aaphostsample/CMakeLists.txt b/java/samples/aaphostsample/CMakeLists.txt
@@ -47,7 +47,7 @@ target_compile_options(aaphostsample
         -Wshadow-field
         )
 
-if (TRUE)
+if (BUILD_WITH_PREFAB)
 if (ANDROID)
     find_package (androidaudioplugin REQUIRED CONFIG)
     set (aaphostsample_LIBS

diff --git a/java/samples/aaphostsample/build.gradle b/java/samples/aaphostsample/build.gradle
@@ -25,9 +25,12 @@ android {
             }
         }
     }
+    // FIXME: PREFAB: enable these sections once we migrate to prefab-based solution.
+    /*
     buildFeatures {
         prefab true
     }
+    */
     buildTypes {
         release {
             minifyEnabled false