diff options
| author | Harish Mahendrakar <hmahendrakar@google.com> | 2024-03-23 00:51:05 +0000 |
|---|---|---|
| committer | Harish Mahendrakar <hmahendrakar@google.com> | 2024-03-23 00:51:05 +0000 |
| commit | 7bdc257a576715224b1dbda86c67cb8f506260b9 (patch) | |
| tree | 45ed6ab9d0b6f83c66bb0594e27bd2d585ecfdd7 | |
| parent | 1f1e719d33a1e091e94b651d86cac2cac679e04e (diff) | |
| download | libaom-7bdc257a576715224b1dbda86c67cb8f506260b9.tar.gz | |
Remove useless `neon:` clause.
There hasn't been a non-neon platform build in years.
Bug: 330929681
Test: Builds
Change-Id: Id42f030a53252911faec43a59bf127c179d612eb
| -rw-r--r-- | Android.bp | 52 | ||||
| -rw-r--r-- | Android.bp.in | 52 |
2 files changed, 48 insertions, 56 deletions
diff --git a/Android.bp b/Android.bp index bf42082c6..04d05ced5 100644 --- a/Android.bp +++ b/Android.bp @@ -731,28 +731,26 @@ cc_library_static { // configured to require the neon unit arm: { - neon: { - local_include_dirs: [ - "config/", - "config/arm/", - ], - srcs: aom_av1_common_sources + - aom_av1_decoder_sources + - aom_dsp_common_sources + - aom_dsp_decoder_sources + - aom_mem_sources + - aom_rtcd_sources + - ["aom_ports/aarch32_cpudetect.c"] + - aom_scale_sources + - aom_sources + - aom_util_sources + - aom_av1_common_intrin_neon + - aom_dsp_common_intrin_neon + - aom_av1_encoder_intrin_neon + - aom_av1_encoder_sources + - aom_dsp_encoder_intrin_neon + - aom_dsp_encoder_sources, - }, + local_include_dirs: [ + "config/", + "config/arm/", + ], + srcs: aom_av1_common_sources + + aom_av1_decoder_sources + + aom_dsp_common_sources + + aom_dsp_decoder_sources + + aom_mem_sources + + aom_rtcd_sources + + ["aom_ports/aarch32_cpudetect.c"] + + aom_scale_sources + + aom_sources + + aom_util_sources + + aom_av1_common_intrin_neon + + aom_dsp_common_intrin_neon + + aom_av1_encoder_intrin_neon + + aom_av1_encoder_sources + + aom_dsp_encoder_intrin_neon + + aom_dsp_encoder_sources, }, x86_64: { @@ -863,12 +861,10 @@ cc_fuzz { ], arch: { arm: { - neon: { - local_include_dirs: [ - "config/", - "config/arm/", - ], - }, + local_include_dirs: [ + "config/", + "config/arm/", + ], }, arm64: { diff --git a/Android.bp.in b/Android.bp.in index f5b4939cd..08345ecbd 100644 --- a/Android.bp.in +++ b/Android.bp.in @@ -79,28 +79,26 @@ cc_library_static { // configured to require the neon unit arm: { - neon: { - local_include_dirs: [ - "config/", - "config/arm/", - ], - srcs: aom_av1_common_sources + - aom_av1_decoder_sources + - aom_dsp_common_sources + - aom_dsp_decoder_sources + - aom_mem_sources + - aom_rtcd_sources + - ["aom_ports/aarch32_cpudetect.c"] + - aom_scale_sources + - aom_sources + - aom_util_sources + - aom_av1_common_intrin_neon + - aom_dsp_common_intrin_neon + - aom_av1_encoder_intrin_neon + - aom_av1_encoder_sources + - aom_dsp_encoder_intrin_neon + - aom_dsp_encoder_sources, - }, + local_include_dirs: [ + "config/", + "config/arm/", + ], + srcs: aom_av1_common_sources + + aom_av1_decoder_sources + + aom_dsp_common_sources + + aom_dsp_decoder_sources + + aom_mem_sources + + aom_rtcd_sources + + ["aom_ports/aarch32_cpudetect.c"] + + aom_scale_sources + + aom_sources + + aom_util_sources + + aom_av1_common_intrin_neon + + aom_dsp_common_intrin_neon + + aom_av1_encoder_intrin_neon + + aom_av1_encoder_sources + + aom_dsp_encoder_intrin_neon + + aom_dsp_encoder_sources, }, x86_64: { @@ -211,12 +209,10 @@ cc_fuzz { ], arch: { arm: { - neon: { - local_include_dirs: [ - "config/", - "config/arm/", - ], - }, + local_include_dirs: [ + "config/", + "config/arm/", + ], }, arm64: { |