diff options
| author | Kevin DuBois <kevindubois@google.com> | 2020-12-14 11:24:42 -0800 |
|---|---|---|
| committer | Kevin DuBois <kevindubois@google.com> | 2020-12-14 11:24:42 -0800 |
| commit | 2ac942a01d5e9b7a0e93b61fcc9b6a5986665c4c (patch) | |
| tree | 700022b4640c2867c1a6f632e5b0b035fd54bd74 | |
| parent | 23ebc73a56737eca6fcccd7981f4c405cff60983 (diff) | |
| download | ComputeLibrary-2ac942a01d5e9b7a0e93b61fcc9b6a5986665c4c.tar.gz | |
ComputeLibrary: move common src to arm arch src
The common srcs in this static library were reliant on neon, so they
weren't really common when targets like x86 or mips were being built.
Address this by moving all the sources under the appropriate arch, that
is arm and arm64.
Bug: 175601942
Test: checkbuild on x86 and arm targets
Change-Id: I75dd19191845c890273f1df627e65caa6517efb4
| -rw-r--r-- | Android.bp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/Android.bp b/Android.bp index 671dac895..e5c3f1ac6 100644 --- a/Android.bp +++ b/Android.bp @@ -39,19 +39,7 @@ arm_compute_library_defaults { rtti: true, } -cc_library_static { - name: "arm_compute_library", - defaults: ["acl-default-cppflags"], - proprietary: true, - local_include_dirs: ["build/android-arm64v8a/src/core", - "build/android-arm64v8a/src/core/CL", - "arm_compute/core/NEON/kernels/assembly", - "arm_compute/core/NEON/kernels/convolution/common", - "arm_compute/core/NEON/kernels/convolution/depthwise", - "src/core/NEON/kernels/assembly", - "src/core/NEON/kernels/convolution/winograd"], - export_include_dirs: [".", "./include"], - srcs: [ +compute_lib_src = [ "src/core/AccessWindowAutoPadding.cpp", "src/core/AccessWindowStatic.cpp", "src/core/AccessWindowTranspose.cpp", @@ -761,11 +749,23 @@ cc_library_static { "utils/CommonGraphOptions.cpp", "utils/GraphUtils.cpp", "utils/Utils.cpp", - - ], +] + +cc_library_static { + name: "arm_compute_library", + defaults: ["acl-default-cppflags"], + proprietary: true, + local_include_dirs: ["build/android-arm64v8a/src/core", + "build/android-arm64v8a/src/core/CL", + "arm_compute/core/NEON/kernels/assembly", + "arm_compute/core/NEON/kernels/convolution/common", + "arm_compute/core/NEON/kernels/convolution/depthwise", + "src/core/NEON/kernels/assembly", + "src/core/NEON/kernels/convolution/winograd"], + export_include_dirs: [".", "./include"], arch: { arm: { - srcs: [ + srcs: compute_lib_src + [ "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", @@ -773,7 +773,7 @@ cc_library_static { ], }, arm64: { - srcs: [ + srcs: compute_lib_src + [ "src/core/NEON/kernels/arm_gemm/kernels/a64_gemm_s16_12x8/generic.cpp", "src/core/NEON/kernels/arm_gemm/kernels/a64_gemm_s8_12x8/a55r1.cpp", "src/core/NEON/kernels/arm_gemm/kernels/a64_gemm_s8_12x8/generic.cpp", @@ -842,4 +842,4 @@ cc_library_static { }, }, rtti: true, -}
\ No newline at end of file +} |