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