Commit graph

88 commits

Author SHA1 Message Date
Xin Li
fcc17e5d0e Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:34 +00:00
Xin Li
9b99e6a8ea DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: I9d37ecefcc91ebab3bc798d0deed9e924ca828d3
2019-09-04 13:33:52 -07:00
Xin Li
9206e29312 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: I0757be296eead566bb474a2567e3d21d8203de23
2019-07-01 20:59:38 +00:00
Xin Li
4c77b6dd5f [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: b48936b8eb -s ours
am skip reason: subject contains skip directive

Change-Id: If64cb26ca4690bb70f0d6775d3ab326f13c88fdc
2019-02-24 01:54:40 -08:00
Xin Li
b48936b8eb DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: Id7be988c7876ec0e8e236d5fbaf20830191898aa
2019-02-20 16:19:01 -08:00
Aniket Kumar Lata
8751cecd80 tinycompress: tinycompress fixes
- Add get_metadata() and set_metadata() API support
 - Add support to send codec specific data

Bug: 123065627
Test: make

Change-Id: I9c3f39e22d7246fbb7cf665a4b5ce71a74e07495
2019-02-08 16:59:28 -08:00
Chih-hung Hsieh
f7c2a4b1b4 Merge "Add default active developers into OWNERS" am: 8586332506 am: db355216b0
am: ae5d1015f9

Change-Id: Icae6f0024ac71c926d7fb7b46bf7791256f743d1
2019-01-04 16:16:42 -08:00
Chih-hung Hsieh
ae5d1015f9 Merge "Add default active developers into OWNERS" am: 8586332506
am: db355216b0

Change-Id: Ideb8ab6ea0b4592f3f56324e49bfb9ec8cc076b8
2019-01-04 16:11:23 -08:00
Chih-hung Hsieh
db355216b0 Merge "Add default active developers into OWNERS"
am: 8586332506

Change-Id: I1f893899bab0869215fc9f034ef988b9ee1cb454
2019-01-04 16:06:17 -08:00
Chih-hung Hsieh
8586332506 Merge "Add default active developers into OWNERS" 2019-01-04 23:48:30 +00:00
Chih-Hung Hsieh
052b54a51e Add default active developers into OWNERS
Bug: 33166666
Test: gerrit uploader
Change-Id: I76b9a3ac5a3f4d1440c5d210925e26afc0abc988
2019-01-04 15:47:33 -08:00
Xin Li
3a54736d56 [automerger skipped] Merge "DO NOT MERGE" am: 4fddf72944 -s ours am: 8d475c5c23 -s ours
am: af190ff1eb  -s ours

Change-Id: I705e4d182e59d5a86091637def1b39e377595bfb
2018-12-10 12:53:37 -08:00
Xin Li
af190ff1eb [automerger skipped] Merge "DO NOT MERGE" am: 4fddf72944 -s ours
am: 8d475c5c23  -s ours

Change-Id: I5aa18da3474d95247496ca7278b277617fed0a53
2018-12-10 11:03:06 -08:00
Xin Li
8d475c5c23 [automerger skipped] Merge "DO NOT MERGE"
am: 4fddf72944  -s ours

Change-Id: I620a71c35f6b2291a9a152d3cbb1ccd4395f9b66
2018-12-10 09:59:50 -08:00
Treehugger Robot
4fddf72944 Merge "DO NOT MERGE" 2018-12-10 17:20:41 +00:00
Xin Li
81d10f5fcf DO NOT MERGE
Merge pie-platform-release (PPRL.181205.001, history only) into master

Bug: 120502534
Change-Id: I66a5886cb435e0856646a8761d59bf798c078863
2018-12-07 16:14:42 -08:00
android-build-team Robot
aa1240808a Snap for 4393550 from 67eecda8d9 to pi-release
Change-Id: Ia5328d0231bb4d1e9349dcc768283043a340e2cc
2017-10-13 08:09:03 +00:00
Chih-hung Hsieh
67eecda8d9 Merge "Use -Werror in external/tinycompress" am: e7d3077126 am: 5e02fdc8eb am: 69d5d66bd6
am: 1926c2138d

Change-Id: Ic5ffa674cf740a0f29997281d469bf067f3bc814
2017-10-12 18:39:32 +00:00
Chih-hung Hsieh
1926c2138d Merge "Use -Werror in external/tinycompress" am: e7d3077126 am: 5e02fdc8eb
am: 69d5d66bd6

Change-Id: Ied3ba388c2be68fbb46e33684a4603d025c5ae15
2017-10-12 18:37:12 +00:00
Chih-hung Hsieh
69d5d66bd6 Merge "Use -Werror in external/tinycompress" am: e7d3077126
am: 5e02fdc8eb

Change-Id: Id2f4d72bbf40acddf774f44bc1a4f465c9dc2db6
2017-10-12 18:26:37 +00:00
Chih-hung Hsieh
5e02fdc8eb Merge "Use -Werror in external/tinycompress"
am: e7d3077126

Change-Id: Ib37cfaa4080019c518ab1a0d7841bf613ad0ed2b
2017-10-12 18:15:18 +00:00
Chih-hung Hsieh
e7d3077126 Merge "Use -Werror in external/tinycompress" 2017-10-12 18:05:17 +00:00
Chih-Hung Hsieh
c1bc48fca7 Use -Werror in external/tinycompress
* Suppress non-critical warnings.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Id0a4f4431f8420dbbe20ec541aa3be6a77567b7c
2017-09-29 11:59:15 -07:00
Steven Moreland
ff64557339 Merge "libtinycompress: Android.mk -> Android.bp" am: 6ded547e25 am: 846573ce25 am: a1e6f4979c
am: c189c3fded

Change-Id: I8bc4ec8dbfc6e12940e19f95d20ed270763fa22f
2017-07-12 16:20:25 +00:00
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