diff options
| author | Renato Grottesi <otaner@google.com> | 2023-07-13 15:37:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-07-13 15:37:38 +0000 |
| commit | da4f8cbc95af50313f8683bf7a400b1b5bfad10c (patch) | |
| tree | c75b255b2bbbabe5e84a1e6094118d17afe8addb | |
| parent | 9fbc65bb1ecc96db86f943a10bd36005b178a842 (diff) | |
| parent | 8acfc52fd399a48296919fe103fd1ba71a8c14e7 (diff) | |
| download | ComputeLibrary-da4f8cbc95af50313f8683bf7a400b1b5bfad10c.tar.gz | |
Merge "Revert^4 "Compile ArmNN shim over the support library"" into main
| -rw-r--r-- | Android.bp | 14 | ||||
| -rw-r--r-- | OWNERS | 1 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp index f6669a466..b367c9ba4 100644 --- a/Android.bp +++ b/Android.bp @@ -68,14 +68,17 @@ arm_compute_library_defaults { "-Wno-inline-asm", "-integrated-as", "-Wno-implicit-fallthrough" - ], - rtti: true, + ], + rtti: true, + openmp: true, } cc_library_static { name: "arm_compute_library", - defaults: ["acl-default-cppflags"], - proprietary: true, + defaults: [ + "neuralnetworks_cl_defaults", + "acl-default-cppflags" + ], local_include_dirs: ["src/core/common", "src/core/helpers", "src/core/NEON/kernels/assembly", @@ -887,7 +890,7 @@ cc_library_static { "utils/CommonGraphOptions.cpp", "utils/GraphUtils.cpp", "utils/Utils.cpp", - + "src/graph/TypeLoader.cpp", ], enabled : false, arch: { @@ -897,7 +900,6 @@ cc_library_static { "src/core/NEON/kernels/arm_gemm/kernels/a32_sgemm_8x6/a53.cpp", "src/core/NEON/kernels/arm_gemm/kernels/a32_sgemm_8x6/a55r1.cpp", "src/core/NEON/kernels/arm_gemm/kernels/a32_sgemm_8x6/generic.cpp", - ], }, arm64: { @@ -2,3 +2,4 @@ jessehall@google.com kevindubois@google.com linjoey@google.com spyffe@google.com +otaner@google.com |