Partial fix for linux build

Test: build with ninja on Linux
Change-Id: Ibb5bdde117732556b5b7f0fa6fba8a57c2912782

diff --git a/build/secondary/third_party/aac/BUILD.gn b/build/secondary/third_party/aac/BUILD.gn
index d9e79a7..18fcf93 100644 (file)
--- a/build/secondary/third_party/aac/BUILD.gn
+++ b/build/secondary/third_party/aac/BUILD.gn
@@ -18,11 +18,15 @@ config("libFraunhoferAAC_config") {
   include_dirs = [
     "libAACdec/include",
     "libAACenc/include",
+    "libArithCoding/include",
+    "libDRCdec/include",
     "libPCMutils/include",
     "libFDK/include",
     "libSYS/include",
     "libMpegTPDec/include",
     "libMpegTPEnc/include",
+    "libSACenc/include",
+    "libSACdec/include",
     "libSBRdec/include",
     "libSBRenc/include",
   ]
@@ -31,17 +35,13 @@ config("libFraunhoferAAC_config") {
 #TODO(jpawlowski): this files are not build right now, but might be useful when
 # arm platform linux compilation is in use:
 #    "libAACdec/src/arm/block_arm.cpp",
-#    "libFDK/src/arm/autocorr2nd.cpp",
 #    "libFDK/src/arm/dct_arm.cpp",
 #    "libFDK/src/arm/fft_rad2_arm.cpp",
-#    "libFDK/src/arm/qmf_arm.cpp",
 #    "libFDK/src/arm/scale_arm.cpp",
-#    "libSBRdec/src/arm/env_calc_arm.cpp",
 #    "libSBRdec/src/arm/lpp_tran_arm.cpp",
-#    "libSYS/src/mips/genericStds_mips.cpp",
 #    "libFDK/src/mips/fft_rad2_mips.cpp",
 #    "libFDK/src/mips/mips_fft_twiddles.cpp",
-#    "libFDK/src/mips/scale.cpp",
+#    "libFDK/src/mips/scale_mips.cpp",
 
 static_library("libFraunhoferAAC") {
   sources = [
@@ -59,12 +59,20 @@ static_library("libFraunhoferAAC") {
     "libAACdec/src/channel.cpp",
     "libAACdec/src/channelinfo.cpp",
     "libAACdec/src/conceal.cpp",
+    "libAACdec/src/FDK_delay.cpp",
     "libAACdec/src/ldfiltbank.cpp",
     "libAACdec/src/pulsedata.cpp",
     "libAACdec/src/rvlcbit.cpp",
     "libAACdec/src/rvlcconceal.cpp",
     "libAACdec/src/rvlc.cpp",
     "libAACdec/src/stereo.cpp",
+    "libAACdec/src/usacdec_ace_d4t64.cpp",
+    "libAACdec/src/usacdec_acelp.cpp",
+    "libAACdec/src/usacdec_ace_ltp.cpp",
+    "libAACdec/src/usacdec_fac.cpp",
+    "libAACdec/src/usacdec_lpc.cpp",
+    "libAACdec/src/usacdec_lpd.cpp",
+    "libAACdec/src/usacdec_rom.cpp",
     "libAACenc/src/aacenc.cpp",
     "libAACenc/src/aacenc_lib.cpp",
     "libAACenc/src/aacenc_pns.cpp",
@@ -85,6 +93,7 @@ static_library("libFraunhoferAAC") {
     "libAACenc/src/line_pe.cpp",
     "libAACenc/src/metadata_compressor.cpp",
     "libAACenc/src/metadata_main.cpp",
+    "libAACenc/src/mps_main.cpp",
     "libAACenc/src/ms_stereo.cpp",
     "libAACenc/src/noisedet.cpp",
     "libAACenc/src/pnsparam.cpp",
@@ -97,18 +106,34 @@ static_library("libFraunhoferAAC") {
     "libAACenc/src/spreading.cpp",
     "libAACenc/src/tonality.cpp",
     "libAACenc/src/transform.cpp",
+    "libArithCoding/src/ac_arith_coder.cpp",
+    "libDRCdec/src/drcDec_gainDecoder.cpp",
+    "libDRCdec/src/drcDec_reader.cpp",
+    "libDRCdec/src/drcDec_rom.cpp",
+    "libDRCdec/src/drcDec_selectionProcess.cpp",
+    "libDRCdec/src/drcDec_tools.cpp",
+    "libDRCdec/src/drcGainDec_init.cpp",
+    "libDRCdec/src/drcGainDec_preprocess.cpp",
+    "libDRCdec/src/drcGainDec_process.cpp",
+    "libDRCdec/src/FDK_drcDecLib.cpp",
     "libFDK/src/autocorr2nd.cpp",
     "libFDK/src/dct.cpp",
     "libFDK/src/FDK_bitbuffer.cpp",
     "libFDK/src/FDK_core.cpp",
     "libFDK/src/FDK_crc.cpp",
+    "libFDK/src/FDK_decorrelate.cpp",
     "libFDK/src/FDK_hybrid.cpp",
+    "libFDK/src/FDK_lpc.cpp",
+    "libFDK/src/FDK_matrixCalloc.cpp",
+    "libFDK/src/FDK_qmf_domain.cpp",
     "libFDK/src/FDK_tools_rom.cpp",
     "libFDK/src/FDK_trigFcts.cpp",
     "libFDK/src/fft.cpp",
     "libFDK/src/fft_rad2.cpp",
     "libFDK/src/fixpoint_math.cpp",
+    "libFDK/src/huff_nodes.cpp",
     "libFDK/src/mdct.cpp",
+    "libFDK/src/nlc_dec.cpp",
     "libFDK/src/qmf.cpp",
     "libFDK/src/scale.cpp",
     "libMpegTPDec/src/tpdec_adif.cpp",
@@ -123,15 +148,45 @@ static_library("libFraunhoferAAC") {
     "libMpegTPEnc/src/tpenc_latm.cpp",
     "libMpegTPEnc/src/tpenc_lib.cpp",
     "libPCMutils/src/limiter.cpp",
-    "libPCMutils/src/pcmutils_lib.cpp",
+    "libPCMutils/src/pcmdmx_lib.cpp",
+    "libPCMutils/src/pcm_utils.cpp",
+    "libSACdec/src/sac_bitdec.cpp",
+    "libSACdec/src/sac_calcM1andM2.cpp",
+    "libSACdec/src/sac_dec_conceal.cpp",
+    "libSACdec/src/sac_dec.cpp",
+    "libSACdec/src/sac_dec_lib.cpp",
+    "libSACdec/src/sac_process.cpp",
+    "libSACdec/src/sac_qmf.cpp",
+    "libSACdec/src/sac_reshapeBBEnv.cpp",
+    "libSACdec/src/sac_rom.cpp",
+    "libSACdec/src/sac_smoothing.cpp",
+    "libSACdec/src/sac_stp.cpp",
+    "libSACdec/src/sac_tsd.cpp",
+    "libSACenc/src/sacenc_bitstream.cpp",
+    "libSACenc/src/sacenc_delay.cpp",
+    "libSACenc/src/sacenc_dmx_tdom_enh.cpp",
+    "libSACenc/src/sacenc_filter.cpp",
+    "libSACenc/src/sacenc_framewindowing.cpp",
+    "libSACenc/src/sacenc_huff_tab.cpp",
+    "libSACenc/src/sacenc_lib.cpp",
+    "libSACenc/src/sacenc_nlc_enc.cpp",
+    "libSACenc/src/sacenc_onsetdetect.cpp",
+    "libSACenc/src/sacenc_paramextract.cpp",
+    "libSACenc/src/sacenc_staticgain.cpp",
+    "libSACenc/src/sacenc_tree.cpp",
+    "libSACenc/src/sacenc_vectorfunctions.cpp",
     "libSBRdec/src/env_calc.cpp",
     "libSBRdec/src/env_dec.cpp",
     "libSBRdec/src/env_extr.cpp",
+    "libSBRdec/src/hbe.cpp",
+    "libSBRdec/src/HFgen_preFlat.cpp",
     "libSBRdec/src/huff_dec.cpp",
     "libSBRdec/src/lpp_tran.cpp",
     "libSBRdec/src/psbitdec.cpp",
     "libSBRdec/src/psdec.cpp",
-    "libSBRdec/src/psdec_hybrid.cpp",
+    "libSBRdec/src/psdec_drm.cpp",
+    "libSBRdec/src/psdecrom_drm.cpp",
+    "libSBRdec/src/pvc_dec.cpp",
     "libSBRdec/src/sbr_crc.cpp",
     "libSBRdec/src/sbr_deb.cpp",
     "libSBRdec/src/sbr_dec.cpp",
@@ -154,20 +209,13 @@ static_library("libFraunhoferAAC") {
     "libSBRenc/src/resampler.cpp",
     "libSBRenc/src/sbrenc_freq_sca.cpp",
     "libSBRenc/src/sbr_encoder.cpp",
+    "libSBRenc/src/sbrenc_ram.cpp",
+    "libSBRenc/src/sbrenc_rom.cpp",
     "libSBRenc/src/sbr_misc.cpp",
-    "libSBRenc/src/sbr_ram.cpp",
-    "libSBRenc/src/sbr_rom.cpp",
     "libSBRenc/src/ton_corr.cpp",
     "libSBRenc/src/tran_det.cpp",
-    "libSYS/src/cmdl_parser.cpp",
-    "libSYS/src/conv_string.cpp",
     "libSYS/src/genericStds.cpp",
-    "libSYS/src/linux/audio_linux.cpp",
-    "libSYS/src/linux/coresup_linux.cpp",
-    "libSYS/src/linux/FDK_stackload_linux.cpp",
-    "libSYS/src/linux/genericStds_linux.cpp",
-    "libSYS/src/linux/uart_linux.cpp",
-    "libSYS/src/wav_file.cpp",
+    "libSYS/src/syslib_channelMapDescr.cpp",
   ]
 
   public_configs = [ ":libFraunhoferAAC_config" ]

diff --git a/build/secondary/third_party/libchrome/BUILD.gn b/build/secondary/third_party/libchrome/BUILD.gn
index 2c561e6..5dea479 100644 (file)
--- a/build/secondary/third_party/libchrome/BUILD.gn
+++ b/build/secondary/third_party/libchrome/BUILD.gn
@@ -24,7 +24,6 @@ source_set("base_sources") {
     "base/base64.h",
     "base/base_export.h",
     "base/base_switches.cc",
-    "base/bind_helpers.cc",
     "base/build_time.cc",
     "base/callback_helpers.cc",
     "base/callback_internal.cc",
@@ -61,30 +60,34 @@ source_set("base_sources") {
     "base/json/json_string_value_serializer.cc",
     "base/json/json_writer.cc",
     "base/json/string_escape.cc",
-    "base/lazy_instance.cc",
+    "base/lazy_instance_helpers.cc",
     "base/location.cc",
     "base/logging.cc",
     "base/md5.cc",
     "base/memory/ref_counted.cc",
     "base/memory/ref_counted_memory.cc",
-    "base/memory/singleton.cc",
     "base/memory/weak_ptr.cc",
     "base/message_loop/incoming_task_queue.cc",
     "base/message_loop/message_loop.cc",
+    "base/message_loop/message_loop_current.cc",
     "base/message_loop/message_loop_task_runner.cc",
     "base/message_loop/message_pump.cc",
     "base/message_loop/message_pump_default.cc",
+    "base/message_loop/message_pump_libevent.cc",
+    "base/message_loop/watchable_io_message_pump_posix.cc",
 
     # we don't want any glib dependencies.
     #   "base/message_loop/message_pump_glib.cc",
-    "base/message_loop/message_pump_libevent.cc",
     "base/metrics/bucket_ranges.cc",
+    "base/metrics/dummy_histogram.cc",
     "base/metrics/field_trial.cc",
-    "base/metrics/metrics_hashes.cc",
-    "base/metrics/histogram_base.cc",
+    "base/metrics/field_trial_param_associator.cc",
     "base/metrics/histogram.cc",
+    "base/metrics/histogram_base.cc",
+    "base/metrics/histogram_functions.cc",
     "base/metrics/histogram_samples.cc",
     "base/metrics/histogram_snapshot_manager.cc",
+    "base/metrics/metrics_hashes.cc",
     "base/metrics/persistent_histogram_allocator.cc",
     "base/metrics/persistent_memory_allocator.cc",
     "base/metrics/persistent_sample_map.cc",
@@ -92,16 +95,22 @@ source_set("base_sources") {
     "base/metrics/sample_vector.cc",
     "base/metrics/sparse_histogram.cc",
     "base/metrics/statistics_recorder.cc",
+    "base/native_library.cc",
+    "base/native_library_posix.cc",
+    "base/observer_list_threadsafe.cc",
+    "base/path_service.cc",
     "base/pending_task.cc",
     "base/pickle.cc",
     "base/posix/file_descriptor_shuffle.cc",
+    "base/posix/global_descriptors.cc",
     "base/posix/safe_strerror.cc",
-    "base/posix/unix_domain_socket_linux.cc",
     "base/process/internal_linux.cc",
     "base/process/kill.cc",
     "base/process/kill_posix.cc",
     "base/process/launch.cc",
     "base/process/launch_posix.cc",
+    "base/process/memory.cc",
+    "base/process/process_handle.cc",
     "base/process/process_handle_linux.cc",
     "base/process/process_handle_posix.cc",
     "base/process/process_info_linux.cc",
@@ -111,9 +120,6 @@ source_set("base_sources") {
     "base/process/process_metrics_linux.cc",
     "base/process/process_metrics_posix.cc",
     "base/process/process_posix.cc",
-    "base/profiler/scoped_profile.cc",
-    "base/profiler/scoped_tracker.cc",
-    "base/profiler/tracked_time.cc",
     "base/rand_util.cc",
     "base/rand_util_posix.cc",
     "base/run_loop.cc",
@@ -137,7 +143,6 @@ source_set("base_sources") {
     "base/synchronization/condition_variable_posix.cc",
     "base/synchronization/lock.cc",
     "base/synchronization/lock_impl_posix.cc",
-    "base/synchronization/read_write_lock_posix.cc",
     "base/synchronization/waitable_event_posix.cc",
     "base/sync_socket_posix.cc",
     "base/sys_info.cc",
@@ -153,13 +158,14 @@ source_set("base_sources") {
     "base/task_runner.cc",
     "base/third_party/icu/icu_utf.cc",
     "base/third_party/nspr/prtime.cc",
-    "base/threading/non_thread_safe_impl.cc",
     "base/threading/platform_thread_internal_posix.cc",
     "base/threading/platform_thread_linux.cc",
     "base/threading/platform_thread_posix.cc",
     "base/threading/post_task_and_reply_impl.cc",
+    "base/threading/scoped_blocking_call.cc",
+    "base/threading/sequence_local_storage_map.cc",
+    "base/threading/sequence_local_storage_slot.cc",
     "base/threading/sequenced_task_runner_handle.cc",
-    "base/threading/sequenced_worker_pool.cc",
     "base/threading/simple_thread.cc",
     "base/threading/thread.cc",
     "base/threading/thread_checker_impl.cc",
@@ -168,49 +174,22 @@ source_set("base_sources") {
     "base/threading/thread_local_storage.cc",
     "base/threading/thread_local_storage_posix.cc",
     "base/threading/thread_restrictions.cc",
-    "base/threading/worker_pool.cc",
-    "base/threading/worker_pool_posix.cc",
     "base/threading/thread_task_runner_handle.cc",
     "base/time/clock.cc",
     "base/time/default_clock.cc",
     "base/time/default_tick_clock.cc",
-    "base/timer/elapsed_timer.cc",
-    "base/timer/timer.cc",
     "base/time/tick_clock.cc",
     "base/time/time.cc",
-    "base/time/time_posix.cc",
-    "base/trace_event/category_registry.cc",
-    "base/trace_event/event_name_filter.cc",
-    "base/trace_event/heap_profiler_allocation_context.cc",
-    "base/trace_event/heap_profiler_allocation_context_tracker.cc",
-    "base/trace_event/heap_profiler_event_filter.cc",
-    "base/trace_event/heap_profiler_stack_frame_deduplicator.cc",
-    "base/trace_event/heap_profiler_type_name_deduplicator.cc",
-    "base/trace_event/malloc_dump_provider.cc",
-    "base/trace_event/memory_allocator_dump.cc",
-    "base/trace_event/memory_allocator_dump_guid.cc",
-    "base/trace_event/memory_dump_manager.cc",
-    "base/trace_event/memory_dump_request_args.cc",
-    "base/trace_event/memory_dump_provider_info.cc",
-    "base/trace_event/memory_dump_scheduler.cc",
-    "base/trace_event/memory_dump_session_state.cc",
-    "base/trace_event/memory_infra_background_whitelist.cc",
-    "base/trace_event/process_memory_dump.cc",
-    "base/trace_event/process_memory_maps.cc",
-    "base/trace_event/process_memory_totals.cc",
-    "base/trace_event/trace_buffer.cc",
-    "base/trace_event/trace_config.cc",
-    "base/trace_event/trace_config_category_filter.cc",
-    "base/trace_event/trace_event_argument.cc",
-    "base/trace_event/trace_event_filter.cc",
-    "base/trace_event/trace_event_impl.cc",
-    "base/trace_event/trace_event_memory_overhead.cc",
-    "base/trace_event/trace_event_synthetic_delay.cc",
-    "base/trace_event/trace_log.cc",
-    "base/trace_event/trace_log_constants.cc",
-    "base/base.cc",
-    "base/tracking_info.cc",
+    "base/time/time_conversion_posix.cc",
+    "base/time/time_exploded_posix.cc",
+    "base/time/time_now_posix.cc",
+    "base/time/time_override.cc",
+    "base/timer/elapsed_timer.cc",
+    "base/timer/timer.cc",
+    "base/unguessable_token.cc",
+    "base/value_iterators.cc",
     "base/values.cc",
+    "base/version.cc",
     "base/vlog.cc",
 
     "dbus/bus.cc",

diff --git a/osi/BUILD.gn b/osi/BUILD.gn
index d45d703..b840bac 100644 (file)
--- a/osi/BUILD.gn
+++ b/osi/BUILD.gn
@@ -27,7 +27,6 @@ static_library("osi") {
     "src/future.cc",
     "src/hash_map_utils.cc",
     "src/list.cc",
-    "src/metrics_linux.cc",
     "src/mutex.cc",
     "src/osi.cc",
     "src/properties.cc",
@@ -41,12 +40,12 @@ static_library("osi") {
     "src/socket_utils/socket_local_client.cc",
     "src/socket_utils/socket_local_server.cc",
     "src/thread.cc",
-    "src/time.cc",
     "src/wakelock.cc",
   ]
 
   include_dirs = [
     "//",
+    "//linux_include",
     "//internal_include",
     "//utils/include",
     "//stack/include",

diff --git a/service/BUILD.gn b/service/BUILD.gn
index 42791f1..6e8a7d8 100644 (file)
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -16,12 +16,22 @@
 
 source_set("service") {
   sources = [
+    "a2dp_sink.cc",
+    "a2dp_source.cc",
     "adapter.cc",
+    "avrcp_control.cc",
+    "avrcp_target.cc",
+    "common/bluetooth/a2dp_codec_config.cc",
     "common/bluetooth/adapter_state.cc",
     "common/bluetooth/advertise_data.cc",
     "common/bluetooth/advertise_settings.cc",
+    "common/bluetooth/avrcp_int_value.cc",
+    "common/bluetooth/avrcp_media_attr.cc",
+    "common/bluetooth/avrcp_register_notification_response.cc",
+    "common/bluetooth/avrcp_string_value.cc",
     "common/bluetooth/characteristic.cc",
     "common/bluetooth/descriptor.cc",
+    "common/bluetooth/remote_device_props.cc",
     "common/bluetooth/scan_filter.cc",
     "common/bluetooth/scan_result.cc",
     "common/bluetooth/scan_settings.cc",
@@ -35,6 +45,8 @@ source_set("service") {
     "hal/bluetooth_interface.cc",
     "ipc/dbus/bluetooth_adapter.cc",
     "ipc/dbus/ipc_handler_dbus.cc",
+    "hal/bluetooth_av_interface.cc",
+    "hal/bluetooth_avrcp_interface.cc",
     "hal/fake_bluetooth_gatt_interface.cc",
     "hal/fake_bluetooth_interface.cc",
     "ipc/ipc_handler.cc",
@@ -50,6 +62,7 @@ source_set("service") {
 
   include_dirs = [
     "//",
+    "//linux_include",
     "//include",
     "//service/common",
     "//third_party/modp_b64/modp64",

diff --git a/stack/BUILD.gn b/stack/BUILD.gn
index a9926e1..619eb68 100644 (file)
--- a/stack/BUILD.gn
+++ b/stack/BUILD.gn
@@ -176,6 +176,7 @@ static_library("stack") {
     "sdp",
     "smp",
     "srvc",
+    "//linux_include",
     "//internal_include",
     "//btcore/include",
     "//vnd/include",

diff --git a/utils/BUILD.gn b/utils/BUILD.gn
index 9e5b481..46b7236 100644 (file)
--- a/utils/BUILD.gn
+++ b/utils/BUILD.gn
@@ -24,5 +24,6 @@ static_library("utils") {
     "//",
     "//stack/include",
     "//third_party/libchrome",
+    "//third_party/googletest/googletest/include/",
   ]
 }