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
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
2017-01-19 06:53:52 +00:00
Colin Cross
ac15f41714
Merge "Don't pass empty arguments to ninja" am: f8acdc50fa
...
am: d4aba70550
2017-01-19 06:51:21 +00:00
Colin Cross
d4aba70550
Merge "Don't pass empty arguments to ninja"
...
am: f8acdc50fa
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
Chris Tate
2b22ec459d
Revert "Add framework sysconfig content to the build"
...
This reverts commit d68045446f
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
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
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
2017-01-19 00:15:57 +00:00
Colin Cross
8b8c5d98f1
Merge "Convert -j to a reasonable parallelism for kati" am: bb5c13d359
...
am: 57de869060
2017-01-19 00:14:26 +00:00
Colin Cross
57de869060
Merge "Convert -j to a reasonable parallelism for kati"
...
am: bb5c13d359
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
2017-01-18 23:55:26 +00:00
Josh Gao
1df77bc0c7
Merge "Add crash_dump and tombstoned products." am: 6651199eeb
...
am: 7cf55a4581
2017-01-18 23:42:40 +00:00
Josh Gao
7cf55a4581
Merge "Add crash_dump and tombstoned products."
...
am: 6651199eeb
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
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
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
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
2017-01-18 18:56:27 +00:00
Nimrod Gileadi
e33294ec98
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am: 11111d875f
...
am: b3aa218921
2017-01-18 18:22:53 +00:00
Nimrod Gileadi
0ec86c4602
Copy IDC for goldfish_rotary to /system/usr/idc am: 8570bcea52
...
am: a5b069e38b
2017-01-18 18:21:07 +00:00
Jorim Jaggi
89abe45160
Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am: ce0bae2f47 am: 27b7101c6c
...
am: 4f34f3d6f0
2017-01-18 18:18:56 +00:00
Jorim Jaggi
a82a67145f
Revert "SELinux: split property_contexts into platform and non-platform components." am: 8cbd925748 am: b909e2c1aa
...
am: 82968395c1
2017-01-18 18:18:46 +00:00
Nimrod Gileadi
9802dfc019
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am: 11111d875f am: d70bbef6bc
...
am: ed2000f147
2017-01-18 17:06:58 +00:00
Nimrod Gileadi
001a362523
Copy IDC for goldfish_rotary to /system/usr/idc am: 8570bcea52 am: edfdd39433
...
am: ab0fd43472
2017-01-18 17:06:24 +00:00
Nimrod Gileadi
ed2000f147
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am: 11111d875f
...
am: d70bbef6bc
2017-01-18 17:00:24 +00:00
Nimrod Gileadi
ab0fd43472
Copy IDC for goldfish_rotary to /system/usr/idc am: 8570bcea52
...
am: edfdd39433
2017-01-18 16:59:52 +00:00
Nimrod Gileadi
b3aa218921
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
...
am: 11111d875f
2017-01-18 16:53:54 +00:00
Nimrod Gileadi
d70bbef6bc
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
...
am: 11111d875f
2017-01-18 16:53:53 +00:00
Nimrod Gileadi
a5b069e38b
Copy IDC for goldfish_rotary to /system/usr/idc
...
am: 8570bcea52
2017-01-18 16:53:23 +00:00
Nimrod Gileadi
edfdd39433
Copy IDC for goldfish_rotary to /system/usr/idc
...
am: 8570bcea52
2017-01-18 16:53:23 +00:00
Jorim Jaggi
4f34f3d6f0
Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am: ce0bae2f47
...
am: 27b7101c6c
2017-01-18 16:47:50 +00:00
Jorim Jaggi
82968395c1
Revert "SELinux: split property_contexts into platform and non-platform components." am: 8cbd925748
...
am: b909e2c1aa
2017-01-18 16:47:43 +00:00
Nimrod Gileadi
11111d875f
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
2017-01-18 16:44:36 +00:00
Jorim Jaggi
27b7101c6c
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
...
am: ce0bae2f47
2017-01-18 16:42:00 +00:00
Jorim Jaggi
b909e2c1aa
Revert "SELinux: split property_contexts into platform and non-platform components."
...
am: 8cbd925748
2017-01-18 16:41:33 +00:00
Jorim Jaggi
ce0bae2f47
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
2017-01-18 16:33:32 +00:00
Jorim Jaggi
8cbd925748
Revert "SELinux: split property_contexts into platform and non-platform components."
...
This reverts commit c5ffdd4bb4
2017-01-18 15:37:30 +00:00
Jorim Jaggi
84fcd62cb4
Revert "SELinux: split property_contexts into platform and non-platform components."
...
This reverts commit c5ffdd4bb4
2017-01-18 16:28:54 +01:00
Nimrod Gileadi
8570bcea52
Copy IDC for goldfish_rotary to /system/usr/idc
...
This IDC file won't be used by the emulator, unless there's an input
device called goldfish_rotary. That device is being added to the kernel
in http://r.android.com/321420 .
Once that device is present, EventHub will look for a file named
goldfish_rotary.idc in the system/usr/idc directory to get the device
configuration.
Bug: 33292948
Change-Id: I384f29980d802280e626915844bddc49bc46110d
2017-01-18 11:02:02 +00:00
Sandeep Patil
a2f758ee16
Merge "SELinux: split property_contexts into platform and non-platform components." am: f91d163625 am: cb0a92be8b am: e3ce754d96
...
am: 2e0e89a0f5
2017-01-18 06:29:25 +00:00
Sandeep Patil
3d425305ee
SELinux: split property_contexts into platform and non-platform components. am: c5ffdd4bb4 am: a94ae916ce am: eec071a34a
...
am: 8a3f41af27
2017-01-18 06:27:05 +00:00
Sandeep Patil
2e0e89a0f5
Merge "SELinux: split property_contexts into platform and non-platform components." am: f91d163625 am: cb0a92be8b
...
am: e3ce754d96
2017-01-18 06:24:38 +00:00
