Skip to content
This repository has been archived by the owner on Nov 8, 2023. It is now read-only.

Commit

Permalink
Merge "Convert to Android.bp" am: c103bea
Browse files Browse the repository at this point in the history
am: 94adbdc

Change-Id: Ib2a5dbf18d89b1feff5c8d5638f7719cee48f209
  • Loading branch information
danw authored and android-build-merger committed Sep 27, 2016
2 parents dc22e01 + 94adbdc commit b157791
Show file tree
Hide file tree
Showing 13 changed files with 130 additions and 114 deletions.
1 change: 1 addition & 0 deletions Android.bp
@@ -0,0 +1 @@
subdirs = ["arm-wt-22k"]
1 change: 0 additions & 1 deletion Android.mk

This file was deleted.

120 changes: 120 additions & 0 deletions arm-wt-22k/Android.bp
@@ -0,0 +1,120 @@
cc_library_shared {
name: "libsonivox",
srcs: [
"lib_src/eas_chorus.c",
"lib_src/eas_chorusdata.c",
"lib_src/eas_data.c",
"lib_src/eas_dlssynth.c",
"lib_src/eas_flog.c",
"lib_src/eas_ima_tables.c",
"lib_src/eas_imaadpcm.c",
"lib_src/eas_imelody.c",
"lib_src/eas_imelodydata.c",
"lib_src/eas_math.c",
"lib_src/eas_mdls.c",
"lib_src/eas_midi.c",
"lib_src/eas_mididata.c",
"lib_src/eas_mixbuf.c",
"lib_src/eas_mixer.c",
"lib_src/eas_ota.c",
"lib_src/eas_otadata.c",
"lib_src/eas_pan.c",
"lib_src/eas_pcm.c",
"lib_src/eas_pcmdata.c",
"lib_src/eas_public.c",
"lib_src/eas_reverb.c",
"lib_src/eas_reverbdata.c",
"lib_src/eas_rtttl.c",
"lib_src/eas_rtttldata.c",
"lib_src/eas_smf.c",
"lib_src/eas_smfdata.c",
"lib_src/eas_voicemgt.c",
"lib_src/eas_wtengine.c",
"lib_src/eas_wtsynth.c",
"lib_src/eas_xmf.c",
"lib_src/eas_xmfdata.c",
"lib_src/wt_22khz.c",
"lib_src/jet.c",
"host_src/eas_config.c",
"host_src/eas_hostmm.c",
"host_src/eas_report.c",

// not using these modules
//"host_src/eas_main.c",
//"host_src/eas_wave.c",
//"lib_src/eas_wavefile.c",
//"lib_src/eas_wavefiledata.c",
],

cflags: [
"-O2",
"-DUNIFIED_DEBUG_MESSAGES",
"-DEAS_WT_SYNTH",
"-D_IMELODY_PARSER",
"-D_RTTTL_PARSER",
"-D_OTA_PARSER",
"-D_XMF_PARSER",
"-DNUM_OUTPUT_CHANNELS=2",
"-D_SAMPLE_RATE_22050",
"-DMAX_SYNTH_VOICES=64",
"-D_8_BIT_SAMPLES",
"-D_FILTER_ENABLED",
"-DDLS_SYNTHESIZER",
"-D_REVERB_ENABLED",

"-Wno-unused-parameter",
"-Werror",

// not using these options
// "-D_WAVE_PARSER",
// "-D_IMA_DECODER", // (needed for IMA-ADPCM wave files)
// "-D_CHORUS_ENABLED",
],

local_include_dirs: [
"host_src",
"lib_src",
],
export_include_dirs: ["include"],

shared_libs: [
"liblog",
"libutils",
"libcutils",
],

arch: {
arm: {
instruction_set: "arm",

srcs: [
"lib_src/ARM-E_filter_gnu.s",
"lib_src/ARM-E_interpolate_loop_gnu.s",
"lib_src/ARM-E_interpolate_noloop_gnu.s",
"lib_src/ARM-E_mastergain_gnu.s",
"lib_src/ARM-E_voice_gain_gnu.s",
],

asflags: [
// In order to use #include instead of .include
"-xassembler-with-cpp",

"-Wa,--defsym,SAMPLE_RATE_22050=1",
"-Wa,--defsym,STEREO_OUTPUT=1",
"-Wa,--defsym,FILTER_ENABLED=1",
"-Wa,--defsym,SAMPLES_8_BIT=1",
],

cflags: [
"-DNATIVE_EAS_KERNEL",
],

// .s files not ported for Clang assembler yet.
clang_asflags: ["-no-integrated-as"],
},
arm64: {
// .s files not ported for Clang assembler yet.
clang_asflags: ["-no-integrated-as"],
},
},
}
108 changes: 0 additions & 108 deletions arm-wt-22k/Android.mk

This file was deleted.

1 change: 1 addition & 0 deletions arm-wt-22k/include/libsonivox/eas.h
1 change: 1 addition & 0 deletions arm-wt-22k/include/libsonivox/eas_reverb.h
1 change: 1 addition & 0 deletions arm-wt-22k/include/libsonivox/eas_types.h
1 change: 1 addition & 0 deletions arm-wt-22k/include/libsonivox/jet.h
2 changes: 1 addition & 1 deletion arm-wt-22k/lib_src/ARM-E_filter_gnu.s
Expand Up @@ -24,7 +24,7 @@
@ PASSED IN: r1
@****************************************************************

.include "ARM_synth_constants_gnu.inc"
#include "ARM_synth_constants_gnu.inc"

.arm
.text
Expand Down
2 changes: 1 addition & 1 deletion arm-wt-22k/lib_src/ARM-E_interpolate_loop_gnu.s
Expand Up @@ -25,7 +25,7 @@
@ PASSED IN: r1
@****************************************************************

.include "ARM_synth_constants_gnu.inc"
#include "ARM_synth_constants_gnu.inc"

.arm
.text
Expand Down
2 changes: 1 addition & 1 deletion arm-wt-22k/lib_src/ARM-E_interpolate_noloop_gnu.s
Expand Up @@ -25,7 +25,7 @@
@ PASSED IN: r1
@****************************************************************

.include "ARM_synth_constants_gnu.inc"
#include "ARM_synth_constants_gnu.inc"

.arm
.text
Expand Down
2 changes: 1 addition & 1 deletion arm-wt-22k/lib_src/ARM-E_mastergain_gnu.s
Expand Up @@ -35,7 +35,7 @@
@
@****************************************************************

.include "ARM_synth_constants_gnu.inc"
#include "ARM_synth_constants_gnu.inc"

.arm
.text
Expand Down
2 changes: 1 addition & 1 deletion arm-wt-22k/lib_src/ARM-E_voice_gain_gnu.s
Expand Up @@ -28,7 +28,7 @@



.include "ARM_synth_constants_gnu.inc"
#include "ARM_synth_constants_gnu.inc"

.arm
.text
Expand Down

0 comments on commit b157791

Please sign in to comment.