Commit graph

114 commits

Author SHA1 Message Date
Steven Moreland
c189c3fded Merge "libtinycompress: Android.mk -> Android.bp" am: 6ded547e25 am: 846573ce25
am: a1e6f4979c

Change-Id: Icc5954eb6620d49e6ca6a8b888e12477c2108478
2017-07-12 16:13:51 +00:00
Steven Moreland
a1e6f4979c Merge "libtinycompress: Android.mk -> Android.bp" am: 6ded547e25
am: 846573ce25

Change-Id: Ifd65522bfd9de6f7597bcc33b7699a263c13a6fb
2017-07-12 16:06:54 +00:00
Steven Moreland
846573ce25 Merge "libtinycompress: Android.mk -> Android.bp"
am: 6ded547e25

Change-Id: I7ae3756f62ddf4577ed52b48f50fd4a5c3531377
2017-07-12 15:59:53 +00:00
Treehugger Robot
6ded547e25 Merge "libtinycompress: Android.mk -> Android.bp" 2017-07-12 15:52:29 +00:00
Steven Moreland
b09957d437 libtinycompress: Android.mk -> Android.bp
device-specific kernel headers are referenced via the new
device_kernel_headers module.

Test: links
Bug: 37512442
Bug: 38117654
Change-Id: I2880e0250460ca506386ebd89dc808b526e6935f
2017-07-12 09:52:23 +09:00
Steven Moreland
8b5bcd1d40 Merge "Move cplay to vendor." am: c85b75c41e am: 69470a8bd8 am: a6b05e6543
am: 0aa94d40d1  -s ours

Change-Id: I388dec64e4d49bc67d97b3d58dea836c733109ea
2017-07-11 19:23:52 +00:00
Steven Moreland
0aa94d40d1 Merge "Move cplay to vendor." am: c85b75c41e am: 69470a8bd8
am: a6b05e6543

Change-Id: I440b059268b5249627cba2daa18eb331296034b7
2017-07-11 19:20:36 +00:00
Steven Moreland
a6b05e6543 Merge "Move cplay to vendor." am: c85b75c41e
am: 69470a8bd8

Change-Id: I8f2caad10fc02fdb52b6bcfa16440d3c7309b94c
2017-07-11 19:16:48 +00:00
Steven Moreland
69470a8bd8 Merge "Move cplay to vendor."
am: c85b75c41e

Change-Id: I9791826235e76bff25cdb497e324ae8210bc3d4d
2017-07-11 19:13:26 +00:00
Treehugger Robot
c85b75c41e Merge "Move cplay to vendor." 2017-07-11 19:07:13 +00:00
Steven Moreland
a2e845ba21 Move cplay to vendor.
cplay is using libtinycompress which is a vendor only module.

Test: CleanSpec works
Test: with BOARD_VNDK_VERSION
Test: hitting "Error: Can't find sync word" with and without this change
  (filed b/63141137)
Bug: 37342627
Merged-In: Id50dd55b772e44d1aa7427caa7338d5096c9e862
Change-Id: Id50dd55b772e44d1aa7427caa7338d5096c9e862
2017-07-11 10:58:50 -07:00
Steven Moreland
70d908303d Move cplay to vendor.
cplay is using libtinycompress which is a vendor only module.

Test: CleanSpec works
Test: with BOARD_VNDK_VERSION
Test: hitting "Error: Can't find sync word" with and without this change
  (filed b/63141137)
Bug: 37342627
Change-Id: Id50dd55b772e44d1aa7427caa7338d5096c9e862
2017-06-29 21:41:31 +00:00
Vijay Venkatraman
dfb513727a Move libtinycompress to vendor partition am: e446d85daf -s ours
am: 0e79f98cf5  -s ours

Change-Id: Ib34e16902b7d2cfc6475b23c8222a4f63fefa6ef
2017-05-17 00:41:53 +00:00
Vijay Venkatraman
0e79f98cf5 Move libtinycompress to vendor partition
am: e446d85daf  -s ours

Change-Id: I4d5f899dfc54802c9832c43f27198386b27ef9e9
2017-05-17 00:39:46 +00:00
Vijay Venkatraman
e446d85daf Move libtinycompress to vendor partition
Bug: 33241851
Test: Build sailfish and pass CTS audio
Test: With BOARD_VNDK_VERSION:=current, no link type check errors for
this lib

(cherry picked from commit c1c913ac02)

Merged-In: I28e9d98a6a77a3e3ea67b406d08861216fa2553b
Change-Id: Ice58fe2ea73188177dde2cb8a30da741ae68cd65
2017-05-16 11:30:56 -07:00
Vijay Venkatraman
32b4a76ea7 Merge "Move libtinycompress to vendor partition" am: 3d60feed72 am: 0707de8e8c am: e340a451a0
am: 00391c1b95

Change-Id: I939c0e1823ec5d8ce5eda1fc2e01334ccfcd06c6
2017-05-12 23:00:19 +00:00
Vijay Venkatraman
00391c1b95 Merge "Move libtinycompress to vendor partition" am: 3d60feed72 am: 0707de8e8c
am: e340a451a0

Change-Id: I0c31156eb0f5299b650757ddc71f2c59f140ce79
2017-05-12 22:51:20 +00:00
Vijay Venkatraman
e340a451a0 Merge "Move libtinycompress to vendor partition" am: 3d60feed72
am: 0707de8e8c

Change-Id: I5e707a374ef4fcdaf4bc17b1e5fab7bca707ae2d
2017-05-12 22:45:57 +00:00
Vijay Venkatraman
0707de8e8c Merge "Move libtinycompress to vendor partition"
am: 3d60feed72

Change-Id: Ie39c38cc41fab16fc3c06883f8313511e22d0983
2017-05-12 22:38:35 +00:00
Vijay Venkatraman
3d60feed72 Merge "Move libtinycompress to vendor partition" 2017-05-12 22:26:07 +00:00
Vijay Venkatraman
c1c913ac02 Move libtinycompress to vendor partition
Bug: 33241851
Test: Build sailfish and pass CTS audio
Test: With BOARD_VNDK_VERSION:=current, no link type check errors for
this lib

Change-Id: I28e9d98a6a77a3e3ea67b406d08861216fa2553b
2017-05-09 11:44:14 -07:00
Steven Moreland
4bfd6866ee Merge changes from topic 'revert-ltc-soong' am: fb05a09a48 am: 1997deeb8c am: b8f549760f
am: 1550702fa8

Change-Id: Iff7af695bf555a3e71dabf0205318cb8e1431906
2017-05-09 16:09:13 +00:00
Steven Moreland
1550702fa8 Merge changes from topic 'revert-ltc-soong' am: fb05a09a48 am: 1997deeb8c
am: b8f549760f

Change-Id: I9d41723be9fc9263f9d1e1c152bc9de458cb3478
2017-05-09 15:51:56 +00:00
Steven Moreland
b8f549760f Merge changes from topic 'revert-ltc-soong' am: fb05a09a48
am: 1997deeb8c

Change-Id: I71b9aac009af507fd7638029292efb8ca3226219
2017-05-09 15:49:26 +00:00
Steven Moreland
1997deeb8c Merge changes from topic 'revert-ltc-soong'
am: fb05a09a48

Change-Id: If764bce1a3bcdc8e7ae04b048b14236d6bda4aa7
2017-05-09 15:47:31 +00:00
Treehugger Robot
fb05a09a48 Merge changes from topic 'revert-ltc-soong'
* changes:
  Revert "libtinycompress: Android.mk -> Android.bp"
  Revert "Add vendor_available:true to libtinycompress so it can be in VNDK"
2017-05-09 15:36:38 +00:00
Steven Moreland
f4cdefcd0c Revert "libtinycompress: Android.mk -> Android.bp"
This reverts commit af6c4c0057.

Reason for revert: b/38117654

Change-Id: Iaf808d3ba12ced816be251214cb20ceba247e9ff
2017-05-08 18:13:10 -07:00
Steven Moreland
015a4c9a4b Revert "Add vendor_available:true to libtinycompress so it can be in VNDK"
This reverts commit b230325cbb.

Reason for revert: b/38117654

Change-Id: I00df422e4c040d6dc8723b187c0b5bd7116e168d
2017-05-08 18:13:06 -07:00
Vijay Venkatraman
6de47b42f3 Merge "Add vendor_available:true to libtinycompress so it can be in VNDK" am: a8e6d4ea56 am: 7e2f61fd3a am: f6e4447a30
am: 337741966d

Change-Id: Ic39bc295718079ed630024f24d70747a67eab6f5
2017-05-08 16:47:13 +00:00
Vijay Venkatraman
337741966d Merge "Add vendor_available:true to libtinycompress so it can be in VNDK" am: a8e6d4ea56 am: 7e2f61fd3a
am: f6e4447a30

Change-Id: Ibc7905df064381fd95e79d2090a231248370d9f4
2017-05-08 16:44:12 +00:00
Vijay Venkatraman
f6e4447a30 Merge "Add vendor_available:true to libtinycompress so it can be in VNDK" am: a8e6d4ea56
am: 7e2f61fd3a

Change-Id: I4c2e1aa8c9cb0c6ec64a2d2ff126938595c359b2
2017-05-08 16:41:42 +00:00
Vijay Venkatraman
7e2f61fd3a Merge "Add vendor_available:true to libtinycompress so it can be in VNDK"
am: a8e6d4ea56

Change-Id: I0b229b298346fcce73a691c4420505f04a1b2469
2017-05-08 16:38:12 +00:00
Treehugger Robot
a8e6d4ea56 Merge "Add vendor_available:true to libtinycompress so it can be in VNDK" 2017-05-08 16:30:56 +00:00
Vijay Venkatraman
b230325cbb Add vendor_available:true to libtinycompress so it can be in VNDK
Bug: 33241851
Test: build sailfish with BOARD_VNDK_VERSION set produces no linking
errors for this lib

Change-Id: I7ac63364a204cb40604f54a849df9cddfcdc915b
2017-05-05 11:49:52 -07:00
Steven Moreland
dac9b0a11d Merge "libtinycompress: Android.mk -> Android.bp" am: 8fbcb03b59 am: 995e3b6186 am: f827f5c7df
am: 95f785fc6c

Change-Id: I44673d74cf9a2351a84a2bd7243408a9282249ac
2017-05-05 17:56:54 +00:00
Steven Moreland
95f785fc6c Merge "libtinycompress: Android.mk -> Android.bp" am: 8fbcb03b59 am: 995e3b6186
am: f827f5c7df

Change-Id: I1e5e0fc81f7bf4e6edbb1b0d96d8877c6a367424
2017-05-05 17:54:54 +00:00
Steven Moreland
f827f5c7df Merge "libtinycompress: Android.mk -> Android.bp" am: 8fbcb03b59
am: 995e3b6186

Change-Id: Ia47ac457a2c2f024f4d93b2fee324477182253cb
2017-05-05 17:52:54 +00:00
Steven Moreland
995e3b6186 Merge "libtinycompress: Android.mk -> Android.bp"
am: 8fbcb03b59

Change-Id: I22a25f5b60384ed12139be6f4972ce3ae1d3198f
2017-05-05 17:50:54 +00:00
Treehugger Robot
8fbcb03b59 Merge "libtinycompress: Android.mk -> Android.bp" 2017-05-05 17:42:13 +00:00
Steven Moreland
af6c4c0057 libtinycompress: Android.mk -> Android.bp
Test: links
Bug: 37512442
Change-Id: I223780f93826a3710be2abeb098f8eb0bbcfc66c
2017-05-04 16:04:10 -07:00
Christopher Ferris
c5b90cd09a Merge "Disable macro redefined warnings." am: 3fd572943a am: 68460e6550
am: f142652670

Change-Id: If4737edc7d976a28f0cdb286e7c2af169ecb7691
2017-02-27 20:27:52 +00:00
Christopher Ferris
f142652670 Merge "Disable macro redefined warnings." am: 3fd572943a
am: 68460e6550

Change-Id: I2ab788b91292461be1610a8ee9e657bfe5b73038
2017-02-27 20:23:47 +00:00
Christopher Ferris
68460e6550 Merge "Disable macro redefined warnings."
am: 3fd572943a

Change-Id: I9bb29b38c53adf95a4bbe3d577ccf7a0bf912b98
2017-02-27 20:17:07 +00:00
Christopher Ferris
3fd572943a Merge "Disable macro redefined warnings." 2017-02-27 20:09:54 +00:00
Christopher Ferris
2cd425cc19 Disable macro redefined warnings.
The new kernel headers do:

  #define __bitwise __bitwise__

However, the code redefines __bitwise without undef'ing it first.

This is a temporary fix, b/35721782 filed to fix this.

Change-Id: Ifc169910091d5b5291ae50c75ebef7c569d140be
Test: Builds without warningers/errors.
2017-02-24 09:36:36 -08:00
Ying Wang
3795714056 am b8f9b742: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit 'b8f9b7428a741c3b1fc1667a4fa80931bcfe224b':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.
2014-12-16 21:01:53 +00:00
Ying Wang
b8f9b7428a Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 2014-12-16 20:47:55 +00:00
Ying Wang
b830fdd603 Cleanup Obsolete LOCAL_PRELINK_MODULE.
Bug: 18675947
Change-Id: Ia3513aa73da2d2ad32a41074d027246837165857
2014-12-16 12:32:37 -08:00
Eric Laurent
d885bbf5fb cplay: use new offload sample rate representation.
Pass directly the sample rate value to struct snd_codec
instead of the ALSA enum.

Bug: 17398311.
Change-Id: Ic65f79759a623136fed8fd755bae39cee3550550
2014-10-28 12:17:44 -07:00
Eric Laurent
daa3871b8b fix missing closing bracket for extern "C" statement in tinymp3.h
Bug: 18100030.
Change-Id: I268aef41dabbafdcaef7c926636bf7bfe7089b1b
2014-10-23 10:41:19 -07:00