Remove CMake branch for Android build (#4729)

Let's use fine-control over each component later.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51034c8..ee6872b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,31 +79,23 @@ nnfw_include(ExtendCMakeFunction)
 add_library(nnapi-header INTERFACE)
 target_include_directories(nnapi-header INTERFACE include)
 
-# TODO For now Android build is being enabled incrementally so not all subdirectories are added yet.
-#      However we are going to have the same subdirectories with other OS eventually.
-if("${TARGET_OS}" STREQUAL "android")
-
-  include_directories(externals/tensorflow)
-  include_directories(externals/acl)
-  include_directories(externals/acl/include)
-  include_directories(externals/flatbuffers/include)
-  include_directories(include)
-
-  add_subdirectory(libs)
-  add_subdirectory(externals)
-  add_subdirectory(tests/tools/nnapi_test)
-  add_subdirectory(tests/tools/tflite_benchmark)
-  add_subdirectory(tests/nnapi)
-
-  add_subdirectory(runtimes)
-
-else("${TARGET_OS}" STREQUAL "android") # General case (non-android build)
-
-  add_subdirectory(externals)
-  add_subdirectory(contrib)
-  add_subdirectory(libs)
-  add_subdirectory(runtimes)
-  add_subdirectory(tests)
-  add_subdirectory(tools)
-
-endif("${TARGET_OS}" STREQUAL "android")
+# TODO Support android build via fine-control for each component
+#      - Introduce BUILD_CONTRIB option
+#      - Set "BUILD_TFLITE_BENCHMARK_MODEL" as OFF for android build
+#
+# The original android build script (for future reference)
+#
+# add_subdirectory(libs)
+# add_subdirectory(externals)
+# add_subdirectory(tests/tools/nnapi_test)
+# add_subdirectory(tests/tools/tflite_benchmark)
+# add_subdirectory(tests/nnapi)
+#
+# add_subdirectory(runtimes)
+
+add_subdirectory(externals)
+add_subdirectory(contrib)
+add_subdirectory(libs)
+add_subdirectory(runtimes)
+add_subdirectory(tests)
+add_subdirectory(tools)