diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-02-09 07:01:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-09 07:01:54 +0000 |
| commit | 1759dbd0ec2ca7e5ce701234abc5f6c2ef173f37 (patch) | |
| tree | a49ff4af1d44486120824f6c36b27edf3641d56c | |
| parent | 74cef026743b786abb327983537bbee8d4347b73 (diff) | |
| parent | 8228d2286506be9b52379212a182001cb5aab5ac (diff) | |
| download | libvpx-1759dbd0ec2ca7e5ce701234abc5f6c2ef173f37.tar.gz | |
Merge "Move neon block to arm level for libvpx" am: 94087fa71a
am: 8228d22865
Change-Id: I4db1d8965d3dc425483aa4b3cbfa3a2692e5f176
| -rw-r--r-- | Android.bp | 12 | ||||
| -rw-r--r-- | Android.bp.in | 12 |
2 files changed, 6 insertions, 18 deletions
diff --git a/Android.bp b/Android.bp index 7f921c641..950ab3cd0 100644 --- a/Android.bp +++ b/Android.bp @@ -2082,15 +2082,9 @@ cc_library_static { // Want arm, not thumb, optimized instruction_set: "arm", - srcs: libvpx_arm_c_srcs, - local_include_dirs: ["config/arm"], - - neon: { - exclude_srcs: libvpx_arm_c_srcs, - srcs: libvpx_arm_neon_c_srcs, - generated_sources: ["libvpx_arm_neon_asm_srcs_converted"], - local_include_dirs: ["config/arm-neon"], - }, + srcs: libvpx_arm_neon_c_srcs, + generated_sources: ["libvpx_arm_neon_asm_srcs_converted"], + local_include_dirs: ["config/arm-neon"], }, arm64: { diff --git a/Android.bp.in b/Android.bp.in index ac6a46435..0ad23b3b8 100644 --- a/Android.bp.in +++ b/Android.bp.in @@ -24,15 +24,9 @@ cc_library_static { // Want arm, not thumb, optimized instruction_set: "arm", - srcs: libvpx_arm_c_srcs, - local_include_dirs: ["config/arm"], - - neon: { - exclude_srcs: libvpx_arm_c_srcs, - srcs: libvpx_arm_neon_c_srcs, - generated_sources: ["libvpx_arm_neon_asm_srcs_converted"], - local_include_dirs: ["config/arm-neon"], - }, + srcs: libvpx_arm_neon_c_srcs, + generated_sources: ["libvpx_arm_neon_asm_srcs_converted"], + local_include_dirs: ["config/arm-neon"], }, arm64: { |