diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-26 23:29:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-26 23:29:11 +0000 |
| commit | 6c0599d0b2aaf9b3c2646393122c51eaf4bc2ef3 (patch) | |
| tree | 76226f1fbc5c1cbe2c18c537179bec15fa4ce57d | |
| parent | bbcf4c48b953fbbb93d1cb90e1d0258eea0bfe32 (diff) | |
| parent | 5a87f15087dd1d71cdc32589d7bb8d5bda8c5a2d (diff) | |
| download | libvpx-sdk-release.tar.gz | |
Merge "Snap for 11630439 from 3df18e52d4e68ecdabff9740b55637f2b3bf1e7f to sdk-release" into sdk-releasesdk-release
| -rw-r--r-- | Android.bp | 18 | ||||
| -rw-r--r-- | Android.bp.in | 18 |
2 files changed, 12 insertions, 24 deletions
diff --git a/Android.bp b/Android.bp index b770ff9a0..573fdaffc 100644 --- a/Android.bp +++ b/Android.bp @@ -1187,13 +1187,11 @@ cc_library { arch: { // configured to require the neon unit arm: { - neon: { - // Want arm, not thumb, optimized - instruction_set: "arm", + // Want arm, not thumb, optimized + instruction_set: "arm", - srcs: libvpx_arm_neon_c_srcs + libvpx_arm_neon_asm_srcs, - local_include_dirs: ["config/arm-neon"], - }, + srcs: libvpx_arm_neon_c_srcs + libvpx_arm_neon_asm_srcs, + local_include_dirs: ["config/arm-neon"], }, arm64: { @@ -1263,9 +1261,7 @@ cc_fuzz { }, arch: { arm: { - neon: { - local_include_dirs: ["config/arm-neon"], - }, + local_include_dirs: ["config/arm-neon"], }, arm64: { @@ -1299,9 +1295,7 @@ cc_fuzz { }, arch: { arm: { - neon: { - local_include_dirs: ["config/arm-neon"], - }, + local_include_dirs: ["config/arm-neon"], }, arm64: { diff --git a/Android.bp.in b/Android.bp.in index befe73c22..c88d8a5da 100644 --- a/Android.bp.in +++ b/Android.bp.in @@ -52,13 +52,11 @@ cc_library { arch: { // configured to require the neon unit arm: { - neon: { - // Want arm, not thumb, optimized - instruction_set: "arm", + // Want arm, not thumb, optimized + instruction_set: "arm", - srcs: libvpx_arm_neon_c_srcs + libvpx_arm_neon_asm_srcs, - local_include_dirs: ["config/arm-neon"], - }, + srcs: libvpx_arm_neon_c_srcs + libvpx_arm_neon_asm_srcs, + local_include_dirs: ["config/arm-neon"], }, arm64: { @@ -128,9 +126,7 @@ cc_fuzz { }, arch: { arm: { - neon: { - local_include_dirs: ["config/arm-neon"], - }, + local_include_dirs: ["config/arm-neon"], }, arm64: { @@ -164,9 +160,7 @@ cc_fuzz { }, arch: { arm: { - neon: { - local_include_dirs: ["config/arm-neon"], - }, + local_include_dirs: ["config/arm-neon"], }, arm64: { |