commit 6d6b0e6261838edeb7086b0c804b3878f2806b14
author Jim Pollock <jmpollock@google.com> Tue Mar 02 10:44:49 2021 +0000
committer Commit Bot <commit-bot@chromium.org> Wed Mar 03 16:25:03 2021 +0000
tree 5dfa82e36b6fc75118d7492f8bc27f36177b9cb2
parent 98f11417d6c4433ac8011bc40401354bef69a664

nn: move driver_cache into the common shared library

The driver cache code is needed by our HAL's for compilation caching.
There's no particularly good reason to keep it as a separate asset, so
folding it into the common library.

BUG=b:181117641
TEST=FEATURES=test emerge-volteer aosp-frameworks-ml-nn

Change-Id: I18f9f6ffa8c8be2a32a2c98c2e6595a7fb4180ff
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/frameworks/ml/+/2727703
Tested-by: Jim Pollock <jmpollock@chromium.org>
Auto-Submit: Jim Pollock <jmpollock@chromium.org>
Reviewed-by: Michael Pishchagin <mblsha@google.com>
Commit-Queue: Michael Pishchagin <mblsha@google.com>

nn/BUILD.gn

diff --git a/nn/BUILD.gn b/nn/BUILD.gn
index 39d0f8a..52f787e 100644
--- a/nn/BUILD.gn
+++ b/nn/BUILD.gn
@@ -7,14 +7,11 @@
 group("all") {
   deps = [
     ":libneuralnetworks",
-    ":driver_cache",
-    ":vendor-nn-hal",
   ]
   if (use.test) {
     deps += [
       ":chromeos_testrunner",
       ":common_testrunner",
-      ":driver_cache_testrunner",
       ":runtime_testrunner",
       ":runtime_generated_testrunner",
       "chromeos/tests:vts",
@@ -144,6 +141,8 @@
     "-Wno-unreachable-code-return",
   ]
   include_dirs = [
+    "driver/cache/BlobCache",
+    "driver/cache/nNCache",
     "runtime/include",
     "${sysroot}/usr/include/libtextclassifier",
   ]
@@ -232,19 +231,6 @@
     "common/random/guarded_philox_random.cc",
     "common/random/random.cc",
     "common/random/simple_philox.cc",
-  ]
-}
-
-static_library("driver_cache") {
-  configs += [
-    ":target_defaults",
-    "//common-mk:pic",
-  ]
-  include_dirs = [
-    "driver/cache/BlobCache",
-    "driver/cache/nnCache",
-  ]
-  sources = [
     "driver/cache/BlobCache/BlobCache.cpp",
     "driver/cache/nnCache/nnCache.cpp",
   ]
@@ -435,6 +421,8 @@
 
   executable("common_testrunner") {
     include_dirs = [
+      "driver/cache/BlobCache",
+      "driver/cache/nNCache",
       "runtime/include",
     ]
     configs += [
@@ -469,23 +457,6 @@
       "common/operations/QuantizedLSTMTest.cpp",
       "common/operations/RNNTest.cpp",
       "common/operations/SVDFTest.cpp",
-    ]
-  }
-
-  executable("driver_cache_testrunner") {
-    include_dirs = [
-      "driver/cache/BlobCache",
-      "driver/cache/nNCache"
-    ]
-    configs += [
-      ":target_defaults",
-      "//common-mk:test",
-    ]
-    deps = [
-      ":driver_cache",
-      ":nn_testrunner",
-    ]
-    sources = [
       "driver/cache/BlobCache/BlobCache_test.cpp",
       "driver/cache/nnCache/nnCache_test.cpp",
     ]