Commit Graph

34909 Commits

Author SHA1 Message Date
Joshua Lang 7f729e0068 Merge changes from topic 'emu_audio_fixes'
* changes:
  Add audio HIDL *-impl and -service libraries to product packages
  Add default audio_submix module to sdk_base build
  Switch video codec config xml to goldfish version
  Adding goldfish_audio_legacy hal to emulator build
  Switch emulator sdk build audio_conf to goldfish
2017-01-20 21:34:00 +00:00
TreeHugger Robot d08fad3995 Merge "Add framework sysconfig content to the build" 2017-01-20 02:55:26 +00:00
Joshua Lang 149363c026 Add audio HIDL *-impl and -service libraries to product packages
Test: check files on the device

BUG: 34470377
Change-Id: I397bb945b92caeff4255bfaca7deb2939a98ba59
2017-01-20 02:53:33 +00:00
Vishwath Mohan a0bac3fb5f Merge "Hide CFI behind a global flag." am: 2d7fb30207 am: 3ca34aeb7e am: 7baefbc0d4
am: d458faeeac

Change-Id: I297ab011fb901d6069672d034e2d8b8483ca21cb
2017-01-20 02:06:16 +00:00
Vishwath Mohan 9abc47d24f Merge "Hide CFI behind a global flag." am: c0bf85a615 am: 1bd8984ace am: 085a015abb
am: 5b30c115a4

Change-Id: I1d854bb525be09926890da631ecfe77a7fb3413c
2017-01-20 02:06:09 +00:00
Vishwath Mohan d458faeeac Merge "Hide CFI behind a global flag." am: 2d7fb30207 am: 3ca34aeb7e
am: 7baefbc0d4

Change-Id: I4c3ec234d252abc64c1f35afc87c03fbaaeea7d2
2017-01-20 01:56:14 +00:00
Vishwath Mohan 5b30c115a4 Merge "Hide CFI behind a global flag." am: c0bf85a615 am: 1bd8984ace
am: 085a015abb

Change-Id: I4b5deed6eb0b3f3ad0cde1ea78f299f0e34db0c6
2017-01-20 01:56:08 +00:00
Vishwath Mohan 7baefbc0d4 Merge "Hide CFI behind a global flag." am: 2d7fb30207
am: 3ca34aeb7e

Change-Id: Ibbc53641416c7493a68bed50e3aea13afd3e1f2f
2017-01-20 01:50:44 +00:00
Vishwath Mohan 085a015abb Merge "Hide CFI behind a global flag." am: c0bf85a615
am: 1bd8984ace

Change-Id: I8e1898c9bc087f66a2e1ed5a45c37a2340f419ad
2017-01-20 01:50:38 +00:00
Vishwath Mohan 3ca34aeb7e Merge "Hide CFI behind a global flag."
am: 2d7fb30207

Change-Id: I40127230f3016e91d9c1010b0cfb9d95b95fa05f
2017-01-20 01:45:43 +00:00
Vishwath Mohan 1bd8984ace Merge "Hide CFI behind a global flag."
am: c0bf85a615

Change-Id: I232a6a5d94ba28a965ba6d69e2dfdbdb66a2eeb8
2017-01-20 01:45:37 +00:00
Vishwath Mohan 2d7fb30207 Merge "Hide CFI behind a global flag." 2017-01-20 01:32:44 +00:00
Vishwath Mohan c0bf85a615 Merge "Hide CFI behind a global flag." 2017-01-20 01:32:44 +00:00
Dan Willemsen 96d0c1fd47 Merge "Support native test prebuilts for X86+ARM builds" am: bf28f5933a am: 4f87826d23 am: b7303cde95
am: 9a5562312c

Change-Id: Ib8eb51136c7755eb52e9f015b4798566ddd6f3e3
2017-01-20 01:30:28 +00:00
Dan Willemsen 9a5562312c Merge "Support native test prebuilts for X86+ARM builds" am: bf28f5933a am: 4f87826d23
am: b7303cde95

Change-Id: Ie91d984c97c6da2cf99f7e838c14a50d6e6dbd1c
2017-01-20 01:20:08 +00:00
Dan Willemsen b7303cde95 Merge "Support native test prebuilts for X86+ARM builds" am: bf28f5933a
am: 4f87826d23

Change-Id: I918859e58ab5d753e8a9cc83fc8f2eab940acbb9
2017-01-20 01:14:05 +00:00
Dan Willemsen 4f87826d23 Merge "Support native test prebuilts for X86+ARM builds"
am: bf28f5933a

Change-Id: I393d50f0452534c40f76fd83703bc7ae443d8a98
2017-01-20 01:09:34 +00:00
Treehugger Robot bf28f5933a Merge "Support native test prebuilts for X86+ARM builds" 2017-01-20 00:59:42 +00:00
Christopher Tate ad71d65dc0 Add framework sysconfig content to the build
Bug 30953212

Change-Id: I2f9f301a38c9d2e7214222f00a44f8ef23f36e6f
2017-01-19 15:22:53 -08:00
Vishwath Mohan a5ff3e4133 Hide CFI behind a global flag.
This CL ensures that locally enabling CFI in a .bp file is not honored
unless it is enabled globally using ENABLE_CFI=true first, effectively
hiding it behind a flag.

Bug: 30227045
Bug: 22033465
Test: m -j40 works and device boots
Test: cfi is correctly honored only when the global flag is set.
Change-Id: Id026302e7f714b90a9e2c996f7a9314f534f90c2
2017-01-19 14:35:31 -08:00
Joshua Lang 39e586071b Add default audio_submix module to sdk_base build
Bug:32612452
Test: Build emu and check file copied
Change-Id: Iadfa4bbf56feabf1080b7b4bc1959d7152bfd1b2
2017-01-19 12:47:36 -08:00
Joshua Lang c7fb1e1c18 Switch video codec config xml to goldfish version
Need to have custom configuration for goldfish video codecs.

Bug:31648354
Test: Build emu and check correct file copied
Change-Id: I30282bc3c4bdb0e88d98a76908bebb2939fd0d64
(cherry picked from commit 9d9cefd03e3f794d6a5aafb9ba2ec4c4d262c224)
2017-01-19 12:47:36 -08:00
Joshua Lang 207a88b183 Adding goldfish_audio_legacy hal to emulator build
Test: Build emu and check file copied
Change-Id: Ib089f58d067905dc21ec32bca341b1c67046152b
(cherry picked from commit 3d65ad3e1e13a8099a78b2814e5cc1ae8ef5ace6)
(cherry picked from commit a1675ce1ab1b58b0994a197ee2c6b81cc7bbf3dd)
2017-01-19 12:47:36 -08:00
Joshua Lang 56296dd5cf Switch emulator sdk build audio_conf to goldfish
Test: Build emu and check correct file copied
Change-Id: I553f8e5a024d51903e51c2ac9520d8d7b9f639af
(cherry picked from commit c1378c053cbc111f7ac20c6aa3c0881ef84b7cba)
2017-01-19 12:47:36 -08:00
Colin Cross 366902561d Merge "Don't pass empty arguments to ninja" am: f8acdc50fa am: d4aba70550 am: ac15f41714
am: 239c78a5b3

Change-Id: Icbd643898cc9babb09090525aa7f0961cf9a04c9
2017-01-19 06:56:22 +00:00
Colin Cross 239c78a5b3 Merge "Don't pass empty arguments to ninja" am: f8acdc50fa am: d4aba70550
am: ac15f41714

Change-Id: I7e3ccee98fa04fbb8887d5dacd8f13e8341d6c05
2017-01-19 06:53:52 +00:00
Colin Cross ac15f41714 Merge "Don't pass empty arguments to ninja" am: f8acdc50fa
am: d4aba70550

Change-Id: I97206e4ec7baad1679f3a5b325a920ab7f8863c0
2017-01-19 06:51:21 +00:00
Colin Cross d4aba70550 Merge "Don't pass empty arguments to ninja"
am: f8acdc50fa

Change-Id: Ic9de7ca0f8269de190570554348053c4f7976195
2017-01-19 06:48:21 +00:00
Treehugger Robot f8acdc50fa Merge "Don't pass empty arguments to ninja" 2017-01-19 06:43:46 +00:00
Colin Cross 524c868107 Don't pass empty arguments to ninja
Passing an empty argument in argv to ninja results in an error:
ninja: error: empty path

Don't add jarg to the argument list if it is empty.

Bug: 34392351
Test: m -j
Change-Id: I39c8998c79b09835650628e1413ae7625cdbc555
2017-01-18 21:12:28 -08:00
Vishwath Mohan 8dcfdcebe9 Hide CFI behind a global flag.
This CL ensures that the LOCAL_SANITIZE=cfi is not honored unless it
is enabled globally using ENABLE_CFI='true' first. This allows CFI to
be hidden behind a flag.

Bug: 30227045
Bug: 22033465
Test: m -j40 works and device boots
Test: cfi is correctly honored only when the global flag is set.
Change-Id: If4508ba448bd4260020483f9c11ee849bb419713
2017-01-18 18:04:00 -08:00
Chris Tate 2b22ec459d Revert "Add framework sysconfig content to the build"
This reverts commit d68045446f.

Change-Id: I86b3c0fbe3eaec915f7dcf92623382d77d008734
2017-01-19 01:12:11 +00:00
TreeHugger Robot 4264d79e50 Merge "emulator: fingerprint: switch to using fingerprint HIDL interface" 2017-01-19 00:50:01 +00:00
Colin Cross 95b4b4ad65 Merge "Convert -j to a reasonable parallelism for kati" am: bb5c13d359 am: 57de869060 am: 8b8c5d98f1
am: 054fe8dc8a

Change-Id: I7cb978ed0c7844c41793e80f581da287abccedc9
2017-01-19 00:48:43 +00:00
Josh Gao 748cc8640a Merge "Add crash_dump and tombstoned products." am: 6651199eeb am: 7cf55a4581 am: 1df77bc0c7
am: 85d13bcb8e

Change-Id: Ifffa02acab8d00a6d400c78ef27e0583f36b80ea
2017-01-19 00:41:16 +00:00
Colin Cross 054fe8dc8a Merge "Convert -j to a reasonable parallelism for kati" am: bb5c13d359 am: 57de869060
am: 8b8c5d98f1

Change-Id: I94f427a5830c5400c0ad96b73b59210ebb845d7b
2017-01-19 00:15:57 +00:00
Colin Cross 8b8c5d98f1 Merge "Convert -j to a reasonable parallelism for kati" am: bb5c13d359
am: 57de869060

Change-Id: I7c115293cc3dc86b7354b60ddf23b1bf5181ed6e
2017-01-19 00:14:26 +00:00
Colin Cross 57de869060 Merge "Convert -j to a reasonable parallelism for kati"
am: bb5c13d359

Change-Id: Id3c6a55e0d6feb91d928a01ffd0875b574a8e5fb
2017-01-19 00:12:27 +00:00
Treehugger Robot bb5c13d359 Merge "Convert -j to a reasonable parallelism for kati" 2017-01-19 00:08:40 +00:00
Josh Gao 85d13bcb8e Merge "Add crash_dump and tombstoned products." am: 6651199eeb am: 7cf55a4581
am: 1df77bc0c7

Change-Id: I298e81531aa44a488ba1ff1e73148de83830fd9a
2017-01-18 23:55:26 +00:00
Josh Gao 1df77bc0c7 Merge "Add crash_dump and tombstoned products." am: 6651199eeb
am: 7cf55a4581

Change-Id: Icf8f7ec6d0a9a74fdad5c7b49c88a5ef71dedd3c
2017-01-18 23:42:40 +00:00
Josh Gao 7cf55a4581 Merge "Add crash_dump and tombstoned products."
am: 6651199eeb

Change-Id: Iccd2f0043281115494f17e4c3d69f7c9a8a6af03
2017-01-18 23:16:55 +00:00
Josh Gao 6651199eeb Merge "Add crash_dump and tombstoned products." 2017-01-18 23:04:09 +00:00
Colin Cross ba55c623cb Convert -j to a reasonable parallelism for kati
When running makeparallel in non-ninja mode, which is used when running
kati with USE_GOMA=true, convert -j to a reasonable parallelism value
the same way ninja does.

Bug: 34392351
Test: make -C build/make/tools/makeparallel makeparallel_test
Change-Id: I9aee4dd2a3b0f2b1c2c10087be83f7b2b06f4368
2017-01-18 14:50:50 -08:00
TreeHugger Robot 7d3fc02dfb Merge "Add framework sysconfig content to the build" 2017-01-18 22:32:13 +00:00
bohu 390e1720a7 emulator: fingerprint: switch to using fingerprint HIDL interface
BUG: 34387576
Change-Id: Ia203ee1540f5c7c80e17d7a17abd3ce126579551
2017-01-18 12:23:39 -08:00
Nimrod Gileadi 482d92addf Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am: 11111d875f am: b3aa218921
am: e33294ec98

Change-Id: Id917a99d3f47deb1300c5375a891a8d83d354313
2017-01-18 19:01:10 +00:00
Nimrod Gileadi ec167c38b5 Copy IDC for goldfish_rotary to /system/usr/idc am: 8570bcea52 am: a5b069e38b
am: 0ec86c4602

Change-Id: I3363395b812cbd1d199dc6c90fc184b1fff1cfe4
2017-01-18 18:59:25 +00:00
Jorim Jaggi c6a02d27c0 Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am: ce0bae2f47 am: 27b7101c6c am: 4f34f3d6f0
am: 89abe45160

Change-Id: Iedf9db6623a5214baa59e1be9ef5d7dfe6591db5
2017-01-18 18:56:42 +00:00
Jorim Jaggi 362f19e3df Revert "SELinux: split property_contexts into platform and non-platform components." am: 8cbd925748 am: b909e2c1aa am: 82968395c1
am: a82a67145f

Change-Id: I735361d5facbe6a5cf1ffe4a61d5aecfa7b4f3db
2017-01-18 18:56:27 +00:00