OSDN Git Service

android-x86/system-media.git
6 years agoMerge "Rename audio_utils/conversion.h to mono_blend.h"
Tri Vo [Mon, 26 Jun 2017 20:35:01 +0000 (20:35 +0000)]
Merge "Rename audio_utils/conversion.h to mono_blend.h"

6 years agoRename audio_utils/conversion.h to mono_blend.h
Glenn Kasten [Fri, 24 Feb 2017 00:55:16 +0000 (16:55 -0800)]
Rename audio_utils/conversion.h to mono_blend.h

There is only one function declared in that header file, and it is
mono_blend, so a more specific filename may be easier to understand.

Test: compiles OK
Merged-In: Ie2aec6c706b1822581b34d3702818b8200a1db8a
Change-Id: Ie2aec6c706b1822581b34d3702818b8200a1db8a
(cherry picked from commit 66c7057547bbbae28704a014a64068a5a6625a48)

6 years agoMerge "Add OWNERS in system/media/camera"
Chih-hung Hsieh [Fri, 23 Jun 2017 18:54:42 +0000 (18:54 +0000)]
Merge "Add OWNERS in system/media/camera"

6 years agoAdd OWNERS in system/media/camera
Chih-Hung Hsieh [Wed, 21 Jun 2017 23:16:00 +0000 (16:16 -0700)]
Add OWNERS in system/media/camera

* This is copied from frameworks/av/camera/OWNERS.
* Owners will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
  https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/

Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I5452c77ed8e9c476c2257718f239fbd56a56ee2e

6 years agoMerge "make libaudioutils_fixedfft vendor_available:true"
Treehugger Robot [Tue, 20 Jun 2017 09:18:00 +0000 (09:18 +0000)]
Merge "make libaudioutils_fixedfft vendor_available:true"

6 years agomake libaudioutils_fixedfft vendor_available:true
Jiyong Park [Mon, 15 May 2017 06:31:44 +0000 (15:31 +0900)]
make libaudioutils_fixedfft vendor_available:true

This, when used with BOARD_VNDK_VERSION flag, enables the
module to be built and installed twice, one for /system,
other for /vendor.

libaudioutils_fixedfft is used by libaudioutils which is in turn used by libs in
/vendor and thus marked as vendor_available. Therefore, libaudioutils_fixedfft
is also marked as vendor_available.

Details: https://android-review.googlesource.com/368372

Bug: 33241851
Test: BOARD_VNDK_VERSION=current m libaudioutils_fixedfft.vendor successful
Merged-In: Ic594eeb153b90ee45e7b5d9b682af9c3ff5471e4
Change-Id: Ic594eeb153b90ee45e7b5d9b682af9c3ff5471e4
(cherry picked from commit 09d178f4f3bc33b347b2f8f6b68e8165f7b4edfc)

7 years agoMerge "Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as vendor...
Vijay Venkatraman [Fri, 12 May 2017 22:27:00 +0000 (22:27 +0000)]
Merge "Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as vendor_available"

7 years agoMerge "libalsautils: moved to vendor partition"
Treehugger Robot [Fri, 12 May 2017 10:17:29 +0000 (10:17 +0000)]
Merge "libalsautils: moved to vendor partition"

7 years agolibalsautils: moved to vendor partition
Isaac Chen [Mon, 10 Apr 2017 06:43:30 +0000 (14:43 +0800)]
libalsautils: moved to vendor partition

Generic AOSP system image doesn't need libalsautils, so move
it to vendor partition in case vendors use it.

Bug: 37117855
Test: Build it with "vendor: true," and make sure it's actually
moved to vendor and also boot successfully on Sailfish.
Change-Id: Ib8c08276f0435b2b37ac6179100b7287b08f6f03

7 years agoMoved libalsautils to vendor. Marked libaudioutils and libaudioroute as
Vijay Venkatraman [Tue, 9 May 2017 18:30:33 +0000 (11:30 -0700)]
Moved libalsautils to vendor. Marked libaudioutils and libaudioroute as
vendor_available

Bug: 33241851
Bug: 37527576
Test: Build sailfish and pass CTS audio
Test: With BOARD_VNDK_VERSION:=current, no link type check
errors related to these libs

Change-Id: Ifacd2305a79a50f6bf3182344bc678082047022f

7 years agoMerge "libaudioeffects: import/export libhardware_headers"
Treehugger Robot [Sat, 6 May 2017 01:58:12 +0000 (01:58 +0000)]
Merge "libaudioeffects: import/export libhardware_headers"

7 years agoMerge "Update path to camera ndk headers"
Colin Cross [Fri, 5 May 2017 22:25:05 +0000 (22:25 +0000)]
Merge "Update path to camera ndk headers"

7 years agoUpdate path to camera ndk headers
Colin Cross [Fri, 5 May 2017 16:36:03 +0000 (09:36 -0700)]
Update path to camera ndk headers

Test: generate-metadata
Change-Id: Idcafb23a5483d77296003230ec75bcbdd393cf52
Merged-In: Idcafb23a5483d77296003230ec75bcbdd393cf52
(cherry picked from commit abc7c4963b25567852b1cdcfbd90a1626dddb3ff)

7 years agolibaudioeffects: import/export libhardware_headers
Steven Moreland [Thu, 4 May 2017 21:06:01 +0000 (14:06 -0700)]
libaudioeffects: import/export libhardware_headers

Required for #include <hardware/audio_effect.h>.

Test: build with BOARD_VNDK_VERSION=current
Bug: 33241851
Change-Id: Ie5b69eddbc47f7de7f1def062e1da54f33a991c2

7 years agoMerge "Add libaudioeffects header library"
Treehugger Robot [Thu, 20 Apr 2017 21:44:06 +0000 (21:44 +0000)]
Merge "Add libaudioeffects header library"

7 years agoAdd libaudioeffects header library
Colin Cross [Thu, 20 Apr 2017 06:05:45 +0000 (23:05 -0700)]
Add libaudioeffects header library

Add a header library for audio-effects instead of requiring modules
to use $(call include-path-for, audio-effects).

Test: m -j checkbuild
Change-Id: I21a191e7fe2911b80396ddbe84cd032592ac43b1

7 years agoMerge changes from topic 'system-vendor-internal-pick'
Treehugger Robot [Thu, 20 Apr 2017 01:39:21 +0000 (01:39 +0000)]
Merge changes from topic 'system-vendor-internal-pick'

* changes:
  libaudio_system_headers: include libcutils_headers
  Add libaudio_system_headers
  Mark as vendor_available
  libradio_metadata: vendor_available
  libradio_metadata: work with BOARD_VNDK_VERSION

7 years agolibaudio_system_headers: include libcutils_headers
Steven Moreland [Tue, 18 Apr 2017 01:25:21 +0000 (18:25 -0700)]
libaudio_system_headers: include libcutils_headers

This is required since system/audio.h (and one more) uses
utils/BitOps.h.

Test: works with BOARD_VNDK_VERSION := current
Bug: 33241851
(cherry picked from commit 013d4a633f73e24f877887060accc0cb74055c89)
Merged-In: I13ef898a702316ccbf8b41ec500b5fd60dce155b
Change-Id: I13ef898a702316ccbf8b41ec500b5fd60dce155b

7 years agoAdd libaudio_system_headers
Steven Moreland [Fri, 14 Apr 2017 02:06:39 +0000 (19:06 -0700)]
Add libaudio_system_headers

Test: modules using this compiled with BOARD_VNDK_VERSION := current
find dependencies
Bug: 33241851
(cherry picked from commit a834562a91b97f8b2ab3a5d6ed99d778c071f2cf)
Merged-In: If2d7ef0ca806b721c65e75774a754a8ee1dbb5fd
Change-Id: If2d7ef0ca806b721c65e75774a754a8ee1dbb5fd

7 years agoMark as vendor_available
Steven Moreland [Wed, 12 Apr 2017 04:04:34 +0000 (21:04 -0700)]
Mark as vendor_available

By setting vendor_available, the following may become true:

* a prebuilt library from this release may be used at runtime by
  in a later releasse (by vendor code compiled against this release).
  so this library shouldn't depend on runtime state that may change
  in the future.
* this library may be loaded twice into a single process (potentially
  an old version and a newer version). The symbols will be isolated
  using linker namespaces, but this may break assumptions about 1
  library in 1 process (your singletons will run twice).

Background:

This means that these modules may be built and installed twice --
once for the system partition and once for the vendor partition. The
system version will build just like today, and will be used by the
framework components on /system. The vendor version will build
against a reduced set of exports and libraries -- similar to, but
separate from, the NDK. This means that all your dependencies must
also mark vendor_available.

At runtime, /system binaries will load libraries from /system/lib*,
while /vendor binaries will load libraries from /vendor/lib*. There
are some exceptions in both directions -- bionic(libc,etc) and liblog
are always loaded from /system. And SP-HALs (OpenGL, etc) may load
/vendor code into /system processes, but the dependencies of those
libraries will load from /vendor until it reaches a library that's
always on /system. In the SP-HAL case, if both framework and vendor
libraries depend on a library of the same name, both versions will be
loaded, but they will be isolated from each other.

It's possible to compile differently -- reducing your source files,
exporting different include directories, etc. For details see:

https://android-review.googlesource.com/368372

None of this is enabled unless the device opts into the system/vendor
split with BOARD_VNDK_VERSION := current.

Bug: 36426473
Bug: 36079834
Test: m -j libcamera_metadata
Test: attempt to compile with BOARD_VNDK_VERSION := current
(cherry picked from commit 4c5e9d1995908cf03aeb91fa5ca0233d1c757fb4)
Merged-In: Ic267fbff784ddb8090266f82d505bcfac52fd1e1
Change-Id: Ic267fbff784ddb8090266f82d505bcfac52fd1e1

7 years agolibradio_metadata: vendor_available
Steven Moreland [Mon, 17 Apr 2017 23:42:15 +0000 (16:42 -0700)]
libradio_metadata: vendor_available

By setting vendor_available, the following may become true:

* a prebuilt library from this release may be used at runtime by
  in a later releasse (by vendor code compiled against this release).
  so this library shouldn't depend on runtime state that may change
  in the future.
* this library may be loaded twice into a single process (potentially
  an old version and a newer version). The symbols will be isolated
  using linker namespaces, but this may break assumptions about 1
  library in 1 process (your singletons will run twice).

Background:

This means that these modules may be built and installed twice --
once for the system partition and once for the vendor partition. The
system version will build just like today, and will be used by the
framework components on /system. The vendor version will build
against a reduced set of exports and libraries -- similar to, but
separate from, the NDK. This means that all your dependencies must
also mark vendor_available.

At runtime, /system binaries will load libraries from /system/lib*,
while /vendor binaries will load libraries from /vendor/lib*. There
are some exceptions in both directions -- bionic(libc,etc) and liblog
are always loaded from /system. And SP-HALs (OpenGL, etc) may load
/vendor code into /system processes, but the dependencies of those
libraries will load from /vendor until it reaches a library that's
always on /system. In the SP-HAL case, if both framework and vendor
libraries depend on a library of the same name, both versions will be
loaded, but they will be isolated from each other.

It's possible to compile differently -- reducing your source files,
exporting different include directories, etc. For details see:

https://android-review.googlesource.com/368372

None of this is enabled unless the device opts into the system/vendor
split with BOARD_VNDK_VERSION := current.

Bug: 36426473
Bug: 37343404
Test: m -j libradio_metadata
Test: attempt to compile with BOARD_VNDK_VERSION := current
(cherry picked from commit c06e7d5ed7abcfae2fac39b7e8988afcc25b9034)
Merged-In: Ia80038019847b24118850adce2e4180065082e9b
Change-Id: Ia80038019847b24118850adce2e4180065082e9b

7 years agolibradio_metadata: work with BOARD_VNDK_VERSION
Steven Moreland [Tue, 18 Apr 2017 02:37:28 +0000 (19:37 -0700)]
libradio_metadata: work with BOARD_VNDK_VERSION

Test: works with BOARD_VNDK_VERSION
Bug: 37342627
(cherry picked from commit 131eff918c241ee5b016a050f13614588f6fc75f)
Merged-In: I734f94348ce5818ee6720f2ad4f3ad3ad6e74633
Change-Id: I734f94348ce5818ee6720f2ad4f3ad3ad6e74633

7 years agoMerge "Convert libbinderwrapper_test_support to static library."
Alex Deymo [Sat, 4 Mar 2017 07:08:51 +0000 (07:08 +0000)]
Merge "Convert libbinderwrapper_test_support to static library."
am: f4de44321e

Change-Id: I22589184436e0687a749b300a44192ce4ca1918e

7 years agoMerge "Convert libbinderwrapper_test_support to static library."
Treehugger Robot [Sat, 4 Mar 2017 07:03:34 +0000 (07:03 +0000)]
Merge "Convert libbinderwrapper_test_support to static library."

7 years agoConvert libbinderwrapper_test_support to static library.
Alex Deymo [Sat, 4 Mar 2017 00:15:21 +0000 (16:15 -0800)]
Convert libbinderwrapper_test_support to static library.

Bug: 35804180
Test: `make checkbuild`
Change-Id: I334a0ad608ea6a7742529cd0f369530abe7ab02e

7 years agoMerge "Implement radio_metadata wrapper for safer memory management." am: fe81805384...
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:42:19 +0000 (20:42 +0000)]
Merge "Implement radio_metadata wrapper for safer memory management." am: fe81805384 am: cf9d8d70c5
am: 468470f755

Change-Id: I4a38099e8b1c5a18714ab3d28f5a9b8793c87e51

7 years agoMerge "Implement radio_metadata wrapper for safer memory management." am: fe81805384
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:38:58 +0000 (20:38 +0000)]
Merge "Implement radio_metadata wrapper for safer memory management." am: fe81805384
am: cf9d8d70c5

Change-Id: Ibada73a9f840ddb7f82e96f9891b184b3c89d017

7 years agoMerge "Implement radio_metadata wrapper for safer memory management."
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:32:57 +0000 (20:32 +0000)]
Merge "Implement radio_metadata wrapper for safer memory management."
am: fe81805384

Change-Id: I33baba501b70de5939f623b8ca69c5cc46ac96e4

7 years agoMerge "Implement radio_metadata wrapper for safer memory management."
Tomasz Wasilczyk [Fri, 27 Jan 2017 20:26:06 +0000 (20:26 +0000)]
Merge "Implement radio_metadata wrapper for safer memory management."

7 years agoImplement radio_metadata wrapper for safer memory management.
Tomasz Wasilczyk [Mon, 23 Jan 2017 22:33:50 +0000 (14:33 -0800)]
Implement radio_metadata wrapper for safer memory management.

Bug: b/34054813
Test: VTS, manual - both done in internal branch
Change-Id: If9c27669bb0d75ca67b75a761afe4cdc9dc51f0b

7 years agoMerge "liblog: use log/log.h when utilizing ALOG macros" am: 1fb716a12b am: b239ca4c99
Mark Salyzyn [Wed, 11 Jan 2017 18:53:20 +0000 (18:53 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros" am: 1fb716a12b am: b239ca4c99
am: f70588249e

Change-Id: If008012618637a2a53a64c1ee580318bee6b63d6

7 years agoMerge "liblog: use log/log.h when utilizing ALOG macros" am: 1fb716a12b
Mark Salyzyn [Wed, 11 Jan 2017 18:48:19 +0000 (18:48 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros" am: 1fb716a12b
am: b239ca4c99

Change-Id: I72bacdf8bca3f057ef26721520042907e62d8d4c

7 years agoMerge "liblog: use log/log.h when utilizing ALOG macros"
Mark Salyzyn [Wed, 11 Jan 2017 18:42:18 +0000 (18:42 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros"
am: 1fb716a12b

Change-Id: I2281b2971bc4557f566da755884e7c7465e4c9bb

7 years agoMerge "liblog: use log/log.h when utilizing ALOG macros"
Treehugger Robot [Wed, 11 Jan 2017 18:36:13 +0000 (18:36 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros"

7 years agoliblog: use log/log.h when utilizing ALOG macros
Mark Salyzyn [Tue, 10 Jan 2017 22:29:16 +0000 (14:29 -0800)]
liblog: use log/log.h when utilizing ALOG macros

Test: compile
Bug: 30465923
Change-Id: I4329b7dc918b732b07662a27c52e3b431ffabd3d

7 years agoMerge "media: Replace cutils/log.h with android/log.h or log/log.h" am: c8a6e3ea23...
Mark Salyzyn [Tue, 27 Dec 2016 22:00:26 +0000 (22:00 +0000)]
Merge "media: Replace cutils/log.h with android/log.h or log/log.h" am: c8a6e3ea23 am: 6f84b4a716
am: bbe900ad12

Change-Id: I4ee9513b768984ab477c3585bd5e78032208c092

7 years agoMerge "media: Replace cutils/log.h with android/log.h or log/log.h" am: c8a6e3ea23
Mark Salyzyn [Tue, 27 Dec 2016 21:52:55 +0000 (21:52 +0000)]
Merge "media: Replace cutils/log.h with android/log.h or log/log.h" am: c8a6e3ea23
am: 6f84b4a716

Change-Id: I3b93f676e39094a3ca5e2161e968185662f6dcf2

7 years agoMerge "media: Replace cutils/log.h with android/log.h or log/log.h"
Mark Salyzyn [Tue, 27 Dec 2016 21:45:24 +0000 (21:45 +0000)]
Merge "media: Replace cutils/log.h with android/log.h or log/log.h"
am: c8a6e3ea23

Change-Id: Iddd2d6d623ba7e6b605937def3bc9b0ac36b4d38

7 years agoMerge "media: Replace cutils/log.h with android/log.h or log/log.h"
Treehugger Robot [Tue, 27 Dec 2016 21:34:30 +0000 (21:34 +0000)]
Merge "media: Replace cutils/log.h with android/log.h or log/log.h"

7 years agomedia: Replace cutils/log.h with android/log.h or log/log.h
Mark Salyzyn [Wed, 28 Sep 2016 22:40:31 +0000 (15:40 -0700)]
media: Replace cutils/log.h with android/log.h or log/log.h

- replace cutils/log.h with android/log.h (main buffer logging)
- replace cutils/log.h with log.log.h (+SafetyNet logging)

Test: compile
Bug: 26552300
Bug: 32189077
Change-Id: Icda4d5ab7555c0b801fd362fdcfa65b1500612b4

7 years agoMerge "Add system/media/Android.bp" am: 0eb9eac06d am: 138805b4e5
Dan Willemsen [Tue, 20 Dec 2016 21:00:50 +0000 (21:00 +0000)]
Merge "Add system/media/Android.bp" am: 0eb9eac06d am: 138805b4e5
am: f6e848ea0e

Change-Id: I5472ee8eb49501a18e895643944ccb51b93373bc

7 years agoMerge "Add system/media/Android.bp" am: 0eb9eac06d
Dan Willemsen [Tue, 20 Dec 2016 20:42:11 +0000 (20:42 +0000)]
Merge "Add system/media/Android.bp" am: 0eb9eac06d
am: 138805b4e5

Change-Id: Ib17b17aee989e69cc9c8d212704c94f84b6e4393

7 years agoMerge "Add system/media/Android.bp"
Dan Willemsen [Tue, 20 Dec 2016 20:33:27 +0000 (20:33 +0000)]
Merge "Add system/media/Android.bp"
am: 0eb9eac06d

Change-Id: Ic355591646ebc2815107f871dc9e26680cca7704

7 years agoMerge "Add system/media/Android.bp"
Treehugger Robot [Tue, 20 Dec 2016 20:25:08 +0000 (20:25 +0000)]
Merge "Add system/media/Android.bp"

7 years agoAdd system/media/Android.bp
Dan Willemsen [Tue, 20 Dec 2016 18:52:30 +0000 (10:52 -0800)]
Add system/media/Android.bp

Test: Soong's build.ninja identical before/after (except GlobRules)
Change-Id: Ib294d1afcfcc311748f436232d27ed381dc99fb6

7 years agoMerge "Fix a typo in config rate check: 441000 -> 44100" am: 84e3d1d1e2 am: 7f7c9626de
Pavlin Radoslavov [Thu, 1 Dec 2016 03:22:46 +0000 (03:22 +0000)]
Merge "Fix a typo in config rate check: 441000 -> 44100" am: 84e3d1d1e2 am: 7f7c9626de
am: 819eafd923

Change-Id: I4a0c07f6cc8ec510747cf499a3b305bb323b1d44

7 years agoMerge "Fix a typo in config rate check: 441000 -> 44100" am: 84e3d1d1e2
Pavlin Radoslavov [Thu, 1 Dec 2016 03:17:45 +0000 (03:17 +0000)]
Merge "Fix a typo in config rate check: 441000 -> 44100" am: 84e3d1d1e2
am: 7f7c9626de

Change-Id: I76380d4d6685f359c947dff027069414402780df

7 years agoMerge "Fix a typo in config rate check: 441000 -> 44100"
Pavlin Radoslavov [Thu, 1 Dec 2016 03:12:45 +0000 (03:12 +0000)]
Merge "Fix a typo in config rate check: 441000 -> 44100"
am: 84e3d1d1e2

Change-Id: I3e570ab57af3f836f4224770301631b06e2204ba

7 years agoMerge "Fix a typo in config rate check: 441000 -> 44100"
Treehugger Robot [Thu, 1 Dec 2016 03:02:33 +0000 (03:02 +0000)]
Merge "Fix a typo in config rate check: 441000 -> 44100"

7 years agoFix a typo in config rate check: 441000 -> 44100
Pavlin Radoslavov [Wed, 30 Nov 2016 18:45:32 +0000 (10:45 -0800)]
Fix a typo in config rate check: 441000 -> 44100

Test: code compilation
Change-Id: I073e1a46723417259c265720168d90938fd38dd0

7 years agoMerge "IAudioPolicyService is now in libaudioclient instead of libmedia" am: 76f97250...
Marco Nelissen [Mon, 7 Nov 2016 17:41:49 +0000 (17:41 +0000)]
Merge "IAudioPolicyService is now in libaudioclient instead of libmedia" am: 76f97250ff am: c58a77360c
am: ff3b15b22e

Change-Id: I8903ffc0ae1b6422d0e10a12817694f072c9a8c9

7 years agoMerge "IAudioPolicyService is now in libaudioclient instead of libmedia" am: 76f97250ff
Marco Nelissen [Mon, 7 Nov 2016 17:32:14 +0000 (17:32 +0000)]
Merge "IAudioPolicyService is now in libaudioclient instead of libmedia" am: 76f97250ff
am: c58a77360c

Change-Id: Id3f3ec80c10a4d698e6f38660cfc911337b91e69

7 years agoMerge "IAudioPolicyService is now in libaudioclient instead of libmedia"
Marco Nelissen [Mon, 7 Nov 2016 17:22:52 +0000 (17:22 +0000)]
Merge "IAudioPolicyService is now in libaudioclient instead of libmedia"
am: 76f97250ff

Change-Id: Ie85b93bdb1b0b004c4cfe9cd2f60cc8766781ced

7 years agoMerge "IAudioPolicyService is now in libaudioclient instead of libmedia"
Marco Nelissen [Mon, 7 Nov 2016 17:14:24 +0000 (17:14 +0000)]
Merge "IAudioPolicyService is now in libaudioclient instead of libmedia"

7 years agoIAudioPolicyService is now in libaudioclient instead of libmedia
Marco Nelissen [Fri, 4 Nov 2016 16:40:24 +0000 (09:40 -0700)]
IAudioPolicyService is now in libaudioclient instead of libmedia

Test: build
Change-Id: I865f3c4bc3a4823802944501f2b3f86711059356

7 years agoaudio_route: add check on enum values am: ff3e6f401e
Eric Laurent [Thu, 13 Oct 2016 00:27:11 +0000 (00:27 +0000)]
audio_route: add check on enum values am: ff3e6f401e
am: e12085b0c5

Change-Id: Ib2155fab97702c791c58ad2f27f5f5d6e0f790ba

7 years agoaudio_route: add check on enum values
Eric Laurent [Thu, 13 Oct 2016 00:19:40 +0000 (00:19 +0000)]
audio_route: add check on enum values
am: ff3e6f401e

Change-Id: I4a9cfe96aac7472dde381cbb8756353d3cd128f2

7 years agoaudio_route: add check on enum values
Eric Laurent [Wed, 12 Oct 2016 17:38:12 +0000 (10:38 -0700)]
audio_route: add check on enum values

Bug: 31906753
Bug: 32064030
Change-Id: Id57ad136b2c314040e6cbf62a3319ecef2c2114b

7 years agoMerge "Removes gnu designated initializers." am: 594952f2a2 am: e72d1d1206
Colin Cross [Thu, 6 Oct 2016 23:46:28 +0000 (23:46 +0000)]
Merge "Removes gnu designated initializers." am: 594952f2a2 am: e72d1d1206
am: 9e36579d55

Change-Id: I935317b76902e6f7554108d817226be32c5e87d8

7 years agoMerge "Removes gnu designated initializers." am: 594952f2a2
Colin Cross [Thu, 6 Oct 2016 23:42:58 +0000 (23:42 +0000)]
Merge "Removes gnu designated initializers." am: 594952f2a2
am: e72d1d1206

Change-Id: Ib38b93b0c35ec8c0ca7e452b283a4059b220e423

7 years agoMerge "Removes gnu designated initializers."
Colin Cross [Thu, 6 Oct 2016 23:39:33 +0000 (23:39 +0000)]
Merge "Removes gnu designated initializers."
am: 594952f2a2

Change-Id: I9b6cf8060c2725d00e61ae282c049a668b699c17

7 years agoMerge "Removes gnu designated initializers."
Colin Cross [Thu, 6 Oct 2016 23:36:34 +0000 (23:36 +0000)]
Merge "Removes gnu designated initializers."

7 years agoRemoves gnu designated initializers.
Ryan Haining [Thu, 8 Sep 2016 01:04:33 +0000 (18:04 -0700)]
Removes gnu designated initializers.

C99 has the '.field = value' syntax, C++ has neither. The only ISO way
to write this is without designating.

Test: m -j
Bug: 31997134
Change-Id: I66d5c8ac65be379865018ac88b09020524293d99

7 years agoMerge "Convert to Android.bp" am: e6be5fc431 am: 481030b1e2
Dan Willemsen [Tue, 4 Oct 2016 02:20:52 +0000 (02:20 +0000)]
Merge "Convert to Android.bp" am: e6be5fc431 am: 481030b1e2
am: 48dadcacc3

Change-Id: Ib90430a1bfd5f8a62907cc954a697b9827047a2e

7 years agoMerge "Convert to Android.bp" am: e6be5fc431
Dan Willemsen [Tue, 4 Oct 2016 02:17:19 +0000 (02:17 +0000)]
Merge "Convert to Android.bp" am: e6be5fc431
am: 481030b1e2

Change-Id: I0455356090a92249e669de99d7e963fa4268e0e8

7 years agoMerge "Convert to Android.bp"
Dan Willemsen [Tue, 4 Oct 2016 02:15:20 +0000 (02:15 +0000)]
Merge "Convert to Android.bp"
am: e6be5fc431

Change-Id: I8bb50a33ec0a1213d37201f0fb6dc4390190d117

7 years agoMerge "Convert to Android.bp"
Dan Willemsen [Tue, 4 Oct 2016 02:09:59 +0000 (02:09 +0000)]
Merge "Convert to Android.bp"

7 years agoConvert to Android.bp
Dan Willemsen [Thu, 22 Sep 2016 23:05:13 +0000 (16:05 -0700)]
Convert to Android.bp

See build/soong/README.md for more information.

Test: mma -j
Test: camera_metadata_test on flounder
Change-Id: I0f699a2a0d120783a5f543cf6d454109a5fc624b

7 years agoMerge "Update escaping in Android.bp files" am: 1bfae98559 am: 8fce0b19ee
Colin Cross [Fri, 30 Sep 2016 04:27:00 +0000 (04:27 +0000)]
Merge "Update escaping in Android.bp files" am: 1bfae98559 am: 8fce0b19ee
am: 8cd8d232d3

Change-Id: I2f71c4c0296609caf48aa9a10a05154f5fa952d3

7 years agoMerge "Update escaping in Android.bp files" am: 1bfae98559
Colin Cross [Fri, 30 Sep 2016 04:24:30 +0000 (04:24 +0000)]
Merge "Update escaping in Android.bp files" am: 1bfae98559
am: 8fce0b19ee

Change-Id: Idecdefd6e64c44e7496d17cad5d76113799df874

7 years agoMerge "Update escaping in Android.bp files"
Colin Cross [Fri, 30 Sep 2016 04:21:33 +0000 (04:21 +0000)]
Merge "Update escaping in Android.bp files"
am: 1bfae98559

Change-Id: Iebdc04b6d38830c77f0b3e493b0a7f2487329804

7 years agoMerge "Update escaping in Android.bp files"
Treehugger Robot [Fri, 30 Sep 2016 04:17:57 +0000 (04:17 +0000)]
Merge "Update escaping in Android.bp files"

7 years agoUpdate escaping in Android.bp files
Colin Cross [Thu, 29 Sep 2016 21:08:28 +0000 (14:08 -0700)]
Update escaping in Android.bp files

Strings like cflags in Android.bp files are parsed by blueprint,
written to build.ninja files, parsed by ninja, and then passed to
/bin/sh -c.  This had resulted in a combination of blueprint
(\"), ninja ($$), and shell (\$) escaping being necessary.

Soong has been updated to automatically handle ninja and shell
escaping, remove extra escaping from Android.bp files.

Bug: 31221587
Test: m -j
Change-Id: Ib1deac0a236a2ad37fce394bbdefbf5a781a38a7

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 08:13:33 +0000 (08:13 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a am: e1bc1ac318 am: 0fafbe88b5 am: 453066787b am: 1414a77d6a am: 48309eb29c am: b0b84bc962 am: bfab6fae72
am: 4eb2a5da1d

Change-Id: I7d08cfbf128556fa108ea6ad376f7cd10924cfc4

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 07:15:42 +0000 (07:15 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a am: e1bc1ac318 am: 0fafbe88b5 am: 453066787b am: 1414a77d6a am: 48309eb29c am: b0b84bc962
am: bfab6fae72

Change-Id: Iff2f2afb8ad109b9dfdfa4e80dde7ab06bea485f

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 06:39:44 +0000 (06:39 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a am: e1bc1ac318 am: 0fafbe88b5 am: 453066787b am: 1414a77d6a am: 48309eb29c
am: 53c4169a75

Change-Id: Id9194c967ebe648f523ce3dfc0918fd4ffeb2d56

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 06:38:02 +0000 (06:38 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a am: e1bc1ac318 am: 0fafbe88b5 am: 453066787b am: 1414a77d6a am: 48309eb29c
am: b0b84bc962

Change-Id: I042fd15d5349c48f7c5aa9a97d31dc66c9380b93

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 06:05:28 +0000 (06:05 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a am: e1bc1ac318 am: 0fafbe88b5 am: 453066787b am: 1414a77d6a
am: 48309eb29c

Change-Id: Ie6b3730caae23ff2d652475902d208f0db3063f5

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 06:04:58 +0000 (06:04 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a am: e1bc1ac318 am: 0fafbe88b5 am: 453066787b am: 1414a77d6a
am: 48309eb29c

Change-Id: I44be4c384bc84e9775c20e1ae6ac9574a025d7d1

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 04:52:09 +0000 (04:52 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a am: e1bc1ac318 am: 0fafbe88b5 am: 453066787b
am: 1414a77d6a

Change-Id: I6247298111aca3a0e3a1cfb6996d23a11b1795b0

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 04:33:42 +0000 (04:33 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a am: e1bc1ac318 am: 0fafbe88b5
am: 453066787b

Change-Id: I56ee2f6ae9366d1ec501a76519cab46cf3381046

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 04:27:29 +0000 (04:27 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a am: e1bc1ac318
am: 0fafbe88b5

Change-Id: I6cdeb5b4234c5e6fcb2882ab7a778fa0894a28ed

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 04:24:41 +0000 (04:24 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f am: af1e40957a
am: e1bc1ac318

Change-Id: Id679d6bcb437c23b4307eff166d3040ccf7aec48

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 02:31:04 +0000 (02:31 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b am: 902b06895f
am: af1e40957a

Change-Id: I574c3cf08bc48e3600321da4a00c21cb8bc32b09

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 01:47:11 +0000 (01:47 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9 am: 960cba3e1b
am: 902b06895f

Change-Id: If84ad0268c76e0113d235e9ab026d634cae9f138

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da6...
rago [Tue, 20 Sep 2016 01:28:00 +0000 (01:28 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a am: a5dddadec9
am: 960cba3e1b

Change-Id: Ie001c2546d97cb913ad178427f5b283d58b80d38

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a
rago [Tue, 20 Sep 2016 00:57:05 +0000 (00:57 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f am: 8682da681a
am: a5dddadec9

Change-Id: I8fcbe5c0edfab078d4b86b6b6dd08d7c36b4dc91

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f
rago [Tue, 20 Sep 2016 00:46:12 +0000 (00:46 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874 am: 99589ed96f
am: 8682da681a

Change-Id: I2393804a8d234f7374a9e65fc358e10b3c2a3a88

7 years agoFix potential overflow in Visualizer effect am: 7bbd500874
rago [Tue, 20 Sep 2016 00:39:51 +0000 (00:39 +0000)]
Fix potential overflow in Visualizer effect am: 7bbd500874
am: 99589ed96f

Change-Id: I99309d36b1db752ed86d2b3f13456cd4f0cd6be1

7 years agoFix potential overflow in Visualizer effect
rago [Tue, 20 Sep 2016 00:35:06 +0000 (00:35 +0000)]
Fix potential overflow in Visualizer effect
am: 7bbd500874

Change-Id: I88bbbf8cfa578a86a692d75dd5a8cab00be0dcfc

7 years agoresolve merge conflicts of 99b39aa to nyc-mr1-dev-plus-aosp
Dan Willemsen [Tue, 13 Sep 2016 01:43:04 +0000 (18:43 -0700)]
resolve merge conflicts of 99b39aa to nyc-mr1-dev-plus-aosp

Change-Id: Ic05b48ec1ae8b1110c231d1bc28a0e05ff38ebc1

7 years agoMerge "Convert to Android.bp" am: 1cfc9bb140
Dan Willemsen [Tue, 13 Sep 2016 01:01:09 +0000 (01:01 +0000)]
Merge "Convert to Android.bp" am: 1cfc9bb140
am: f8a26b926d

Change-Id: I33df472d5ceb70aba32e25b283e8e4ade33aa637

7 years agoMerge "Convert to Android.bp"
Dan Willemsen [Tue, 13 Sep 2016 00:58:08 +0000 (00:58 +0000)]
Merge "Convert to Android.bp"
am: 1cfc9bb140

Change-Id: Ic30d6d9bf11dcd5f581010d3d838aa4141fff593

7 years agoMerge "Convert to Android.bp"
Treehugger Robot [Tue, 13 Sep 2016 00:47:39 +0000 (00:47 +0000)]
Merge "Convert to Android.bp"

7 years agoConvert to Android.bp
Dan Willemsen [Mon, 12 Sep 2016 23:15:40 +0000 (16:15 -0700)]
Convert to Android.bp

For more information about soong, see build/soong/README.md

Test: mma; Ran primitives_tests on flounder
Change-Id: I67db202775929e271a54c22d585f19cf6b1ef174

7 years agoFix potential overflow in Visualizer effect
rago [Tue, 23 Aug 2016 18:09:52 +0000 (11:09 -0700)]
Fix potential overflow in Visualizer effect

Bug: 30229821
Change-Id: Ia07041a5a149d7d3e120aa6ea0345fb86da37c9b
(cherry picked from commit b61dd321d08b21a5629044eca7f96e2ecd348e5f)

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
Eino-Ville Talvala [Wed, 17 Aug 2016 23:43:34 +0000 (23:43 +0000)]
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99 am: ab159ee14e am: e0cb79f1bc am: 3197a71063 am: ac2655b5cb am: bf7bc974e5 am: 000c33c8eb am: 220505e6fe
am: fc2cdc605b

Change-Id: I497fca7878c00aab9363f1d09f74375f5cac9ac4

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
Eino-Ville Talvala [Wed, 17 Aug 2016 23:40:49 +0000 (23:40 +0000)]
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99 am: ab159ee14e am: e0cb79f1bc am: 3197a71063 am: ac2655b5cb am: bf7bc974e5 am: 000c33c8eb
am: 95c7dd6db4

Change-Id: I2d98776730cbe9bb6feba8cb7ea67ec8b23ff012

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
Eino-Ville Talvala [Wed, 17 Aug 2016 23:37:48 +0000 (23:37 +0000)]
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99 am: ab159ee14e am: e0cb79f1bc am: 3197a71063 am: ac2655b5cb am: bf7bc974e5 am: 000c33c8eb
am: 220505e6fe

Change-Id: I15906d44b27b3e7513dcee541f25a239dbe54d04

7 years agoresolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f219...
Eino-Ville Talvala [Wed, 17 Aug 2016 23:34:48 +0000 (23:34 +0000)]
resolve merge conflicts of 28ce9cd to lmp-dev am: 53d55d7834 am: 009bc279a2 am: 6f21973d99 am: ab159ee14e am: e0cb79f1bc am: 3197a71063 am: ac2655b5cb am: bf7bc974e5
am: 000c33c8eb

Change-Id: I5b4d1e7d07d2ebd5c2c488b3dd3d76e1dcb6d93a