From 5c9d0b69c78ce7f75bf32c3ad1f26b12c37cffbb Mon Sep 17 00:00:00 2001 From: Renato Grottesi Date: Tue, 11 Jul 2023 15:32:52 +0000 Subject: DO NOT MERGE : Revert^2 "Compile ArmNN shim over the support library" Update the ComputeLibrary to be statically linked in the NNAPI Support Library. Test: Local run of CtsNNAPITestCases Test: Local run of VtsHalNeuralnetworksTargetTest Test: Local run of MLTS Benchmark Bug: 283724775 Change-Id: I28c4f1107313b39a4723ccea17b1dfeab4617ca4 --- Android.bp | 14 ++++++++------ 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: { diff --git a/OWNERS b/OWNERS index 4797ae5c7..7862a7e03 100644 --- a/OWNERS +++ b/OWNERS @@ -2,3 +2,4 @@ jessehall@google.com kevindubois@google.com linjoey@google.com spyffe@google.com +otaner@google.com -- cgit v1.2.3