diff options
author | Renato Grottesi <otaner@google.com> | 2023-07-11 13:19:56 +0000 |
---|---|---|
committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2023-07-11 14:07:43 +0000 |
commit | dc177732dff1a115d1c6b262e287d93c1c84e7cf (patch) | |
tree | 69e5c9b8d1d1be74c883aa6652ecf3f20a48be64 | |
parent | da8eb7984d54a22aabb3c5cc1783a33765786204 (diff) | |
download | ComputeLibrary-dc177732dff1a115d1c6b262e287d93c1c84e7cf.tar.gz |
Revert "Compile ArmNN shim over the support library"
Revert submission 2642112-armnn_aidl_aosp
Reason for revert: missing device settings b/290745599
Reverted changes: /q/submissionid:2642112-armnn_aidl_aosp
(cherry picked from https://android-review.googlesource.com/q/commit:a688d989340c870fa64322b288f23acfeadcb2f0)
Merged-In: Ide61dd331628c5cb3556aaa8fa41b2c3e761b715
Change-Id: Ide61dd331628c5cb3556aaa8fa41b2c3e761b715
-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 |