Josh Gao
57795ff2a8
Merge "Fix stacks on 64 bit processes." am: aea79fa207
am: d3e865abbe
...
am: a941b547c0
Change-Id: I37a1e3a3ab37b7f8b35b2951815d6af8c96e0d5f
2017-03-01 21:21:58 +00:00
Josh Gao
a941b547c0
Merge "Fix stacks on 64 bit processes." am: aea79fa207
...
am: d3e865abbe
Change-Id: I8b213db27f67f7ed9ca9edd08990226fd860078a
2017-03-01 21:19:22 +00:00
Josh Gao
d3e865abbe
Merge "Fix stacks on 64 bit processes."
...
am: aea79fa207
Change-Id: I67828f33969225c3c61c50f533b2a2a77f9bb78c
2017-03-01 21:16:54 +00:00
Treehugger Robot
aea79fa207
Merge "Fix stacks on 64 bit processes."
2017-03-01 21:05:34 +00:00
Philip P. Moltmann
46c821d577
Merge "Ship BuiltInPrintService in default repo" am: 779ba5e692
am: d73c40d73c
...
am: 7d91f81dfb
Change-Id: I7f88828e279abf0cdf154dbeefc4a48359646886
2017-03-01 19:35:53 +00:00
Josh Gao
310b6ff676
Fix stacks on 64 bit processes.
...
debuggerd64 doesn't exist anymore, `debuggerd $PID` works on both 32
and 64 bit processes.
Bug: http://b/35872661
Change-Id: I47be05c7ec346e5d657d06e6c3aff1723494639b
2017-03-01 11:34:58 -08:00
Philip P. Moltmann
7d91f81dfb
Merge "Ship BuiltInPrintService in default repo" am: 779ba5e692
...
am: d73c40d73c
Change-Id: If3287144fe5ba43ce611a0c6f291b77346ad76e4
2017-03-01 19:33:22 +00:00
Philip P. Moltmann
d73c40d73c
Merge "Ship BuiltInPrintService in default repo"
...
am: 779ba5e692
Change-Id: Iee8e4c9a0b7ebd555c94865e8781fbd1a996e56c
2017-03-01 19:30:52 +00:00
Philip P. Moltmann
779ba5e692
Merge "Ship BuiltInPrintService in default repo"
2017-03-01 19:21:48 +00:00
Tao Bao
fb8d22de03
Merge "releasetools: Merge two identical conditional branches." am: 59978ab6e3
am: 514e6e4488
...
am: 81d1ad1267
Change-Id: Ia106d318e77b954eadcfdcd80e13e85f89e43187
2017-03-01 18:08:17 +00:00
Tao Bao
81d1ad1267
Merge "releasetools: Merge two identical conditional branches." am: 59978ab6e3
...
am: 514e6e4488
Change-Id: I8f95b75becdb503c1837c1bc215f88f019eaa356
2017-03-01 18:05:46 +00:00
Tao Bao
514e6e4488
Merge "releasetools: Merge two identical conditional branches."
...
am: 59978ab6e3
Change-Id: I7a5c85ebff5e3ee4ecf3209b3a016daa1ddb14a9
2017-03-01 18:03:46 +00:00
Treehugger Robot
59978ab6e3
Merge "releasetools: Merge two identical conditional branches."
2017-03-01 17:58:12 +00:00
Tao Bao
9beea2a4a3
releasetools: Merge two identical conditional branches.
...
The merged two branches have become identical since commit
fc3422ad36
(landed into Nougat).
Test: Get identical incremental packages w/ and w/o the CL.
Change-Id: Id1183f8ed83f684a0dac1a4af87b6e075b08aabc
2017-02-28 20:20:27 -08:00
Ryan Campbell
8beb26d5cb
Merge "Use c and cpp objects for gcov." am: d579b8eb1f
am: 425bbada28
...
am: 74ec2776e8
Change-Id: Ibc591b89c7c674dd9afaa98acff994eec2faa2fd
2017-03-01 03:14:53 +00:00
Ryan Campbell
74ec2776e8
Merge "Use c and cpp objects for gcov." am: d579b8eb1f
...
am: 425bbada28
Change-Id: Ia86f4824c74c550b4e9f3fca63241dd63b179a7d
2017-03-01 03:12:22 +00:00
Ryan Campbell
425bbada28
Merge "Use c and cpp objects for gcov."
...
am: d579b8eb1f
Change-Id: I6490b5b6c443952ac672847df8748df31e5933ff
2017-03-01 03:10:24 +00:00
Ryan Campbell
d579b8eb1f
Merge "Use c and cpp objects for gcov."
2017-03-01 03:05:56 +00:00
Yifan Hong
b5d70b3a77
Merge "Add system/manifest.xml on device" am: 569cb34dc0
am: 40517f3ea3
...
am: 65460a8fb9
Change-Id: I1943a06d7480363df5352d0fe88cdc6a69825153
2017-03-01 03:02:26 +00:00
Yifan Hong
65460a8fb9
Merge "Add system/manifest.xml on device" am: 569cb34dc0
...
am: 40517f3ea3
Change-Id: I82889a7327c9e7bedec18b4ba38826e8227815df
2017-03-01 02:59:54 +00:00
Yifan Hong
40517f3ea3
Merge "Add system/manifest.xml on device"
...
am: 569cb34dc0
Change-Id: Id838f4f9f25694c6347c35ca6470ff781fa7db42
2017-03-01 02:57:58 +00:00
Treehugger Robot
569cb34dc0
Merge "Add system/manifest.xml on device"
2017-03-01 02:54:52 +00:00
Ryan Campbell
5a6ea36cb8
Use c and cpp objects for gcov.
...
Instead of using all_objects and translating .o to .gcno, use
cpp_objects, gen_cpp_objects, c_objects, gen_c_objects, objc_objects,
and objcpp_objects. Fixes bug with .s files breaking coverage builds.
Bug: 35843991
Test: lunch sailfish-userdebug && make -j60 NATIVE_COVERAGE=true
COVERAGE_PATHS="vendor/google_devices/marlin/proprietary/mm-camera/mm-camera2"
Change-Id: Ib2f8eef889f075ec82f79d8c3ae0fe31962b653d
2017-02-28 16:29:06 -08:00
Yifan Hong
7ebc342b86
Add system/manifest.xml on device
...
Similar to vendor/manifest.xml on device, this file lists
all HALs defined in the framework (and hence go
to the system image). IServiceManager / IMemory /
etc. getService should consult this file (via VINTF
object under /system/libvintf) to return the HAL in the correct
transport mode.
Bug: 34772739 Create system/manifest.xml
Bug: 35219444 Need interface + instance entry
Test: compiles and manually confirm that system/manifest.xml exist.
Change-Id: I5b3c79b068841e47062cbab6f72d70555801a21d
2017-02-28 16:13:42 -08:00
Simran Basi
fdf88008d7
Merge "Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories." am: 6abedc9b3e
am: 22cc401165
...
am: 7fa662af82
Change-Id: I010caf27bae2b65f47c9d92c37f3d5b456fa6397
2017-02-28 23:50:39 +00:00
Simran Basi
7fa662af82
Merge "Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories." am: 6abedc9b3e
...
am: 22cc401165
Change-Id: Ie62e372c19e2b187079c9830ba4936aaa14bec29
2017-02-28 23:48:10 +00:00
Simran Basi
22cc401165
Merge "Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories."
...
am: 6abedc9b3e
Change-Id: Ic01ee13e25df68d8cf850fa81b445150f16f1136
2017-02-28 23:46:09 +00:00
Treehugger Robot
6abedc9b3e
Merge "Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories."
2017-02-28 23:42:18 +00:00
Dan Willemsen
aa7e67c871
Merge changes I5e684409,I4fa35540,I24015ef0 am: 93de77745c
am: d1378dec05
...
am: ead8af8580
Change-Id: I0608060da7307b9bd9a5bd15e601b1787c510dd4
2017-02-28 21:41:33 +00:00
Dan Willemsen
ead8af8580
Merge changes I5e684409,I4fa35540,I24015ef0 am: 93de77745c
...
am: d1378dec05
Change-Id: Ib7984c3abaed6c2ad5e63beee45bc263d076750c
2017-02-28 21:39:01 +00:00
Dan Willemsen
d1378dec05
Merge changes I5e684409,I4fa35540,I24015ef0
...
am: 93de77745c
Change-Id: I2ac9d2922435058bcd900f902c308736f6710bed
2017-02-28 21:37:03 +00:00
Dan Willemsen
93de77745c
Merge changes I5e684409,I4fa35540,I24015ef0
...
* changes:
Improve module tags warnings
Improve warnings for package-modules.mk
Fix all_named_products, remove kati_all_products
2017-02-28 21:30:55 +00:00
Dan Willemsen
3571f256a2
Merge "Turn USE_SOONG_UI on by default" am: 39a6418d76
am: d9b773845d
...
am: 1614715054
Change-Id: I634496e0b0887e18fa39be5b8fb380d3780b4f17
2017-02-28 20:46:29 +00:00
Dan Willemsen
1614715054
Merge "Turn USE_SOONG_UI on by default" am: 39a6418d76
...
am: d9b773845d
Change-Id: I3c68df14dc3fcd8152075186404ffe5a8f4fe19c
2017-02-28 20:44:27 +00:00
Dan Willemsen
d9b773845d
Merge "Turn USE_SOONG_UI on by default"
...
am: 39a6418d76
Change-Id: If4a59c9d051f4d3dd4152f5f30da50bf5feeceaf
2017-02-28 20:42:27 +00:00
Simran Basi
6bea37c7fa
Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories.
...
1) Updates the LOCAL_COMPATIBILITY_SUITE line to allow for a
testcase to belong to multiple suites.
2) Building testcases no longer fails if
COMPATIBILITY_TESTCASES_OUT_<suite> is not defined. This
testcase will just not output to that directory.
This will be utilized by the device-tests and general-tests
suites that don't require any extra output besides the common
testcase directory.
Bug: 35394351
Test: 1) Added multiple *TS testcases to cts & vts and verified they
ended up in the common directory and each suite's testcase
directory. Specifically tested CtsSplitApp to ensure the
split usecase still works as well.
2) Added a CTS testcase to the device-tests suite, built
device-tests and verified the cts/android-cts/testcases
copy was not produced.
Change-Id: Ic4c4e87e62be4fc0c5e394d88cc359518346dffa
2017-02-28 12:41:40 -08:00
Dan Willemsen
39a6418d76
Merge "Turn USE_SOONG_UI on by default"
2017-02-28 20:35:09 +00:00
Elliott Hughes
41232ebd5c
Merge "There's no longer a limit on property names." am: dda91dbef8
am: daac92eb51
...
am: 319fcc7668
Change-Id: Idb24042310fa9de8f534e9988285a16b714daf10
2017-02-28 20:22:56 +00:00
Elliott Hughes
319fcc7668
Merge "There's no longer a limit on property names." am: dda91dbef8
...
am: daac92eb51
Change-Id: I6f2856dfc2b11f7bc4c03059ce3626528b8d4538
2017-02-28 20:20:57 +00:00
Elliott Hughes
daac92eb51
Merge "There's no longer a limit on property names."
...
am: dda91dbef8
Change-Id: Ia3e5851c5033b35d28ad1405b863c8305ccd8cf8
2017-02-28 20:18:27 +00:00
Treehugger Robot
dda91dbef8
Merge "There's no longer a limit on property names."
2017-02-28 20:13:14 +00:00
Dan Willemsen
73da612ed0
Turn USE_SOONG_UI on by default
...
Set USE_SOONG_UI=false to disable the new soong_ui wrapper.
Test: m -j blueprint_tools
Test: USE_SOONG_UI=false m -j blueprint_tools
Change-Id: I0b217939a29fd51e69ef594f824b14e25a4c8c4d
2017-02-28 18:57:12 +00:00
Tao Bao
0e03a0b168
Merge "Remove the backwards compatibility support for misc_info.txt." am: 042d5a846f
am: ba765d7c47
...
am: 1f4831830e
Change-Id: I61d552561842f6b4f27d19c0f3924aab5b8f41c8
2017-02-28 18:15:17 +00:00
Tao Bao
1f4831830e
Merge "Remove the backwards compatibility support for misc_info.txt." am: 042d5a846f
...
am: ba765d7c47
Change-Id: Ibfefb981ccc25a28525e0c9569270c50b15a52a6
2017-02-28 18:13:18 +00:00
Tao Bao
ba765d7c47
Merge "Remove the backwards compatibility support for misc_info.txt."
...
am: 042d5a846f
Change-Id: I1696d4661caa9b5b14121da0f1e0e1bedf6b31bf
2017-02-28 18:10:18 +00:00
Treehugger Robot
042d5a846f
Merge "Remove the backwards compatibility support for misc_info.txt."
2017-02-28 18:05:16 +00:00
Elliott Hughes
05c1a2a55c
There's no longer a limit on property names.
...
Bug: http://b/33926793
Test: boots
Change-Id: I12cdae782090fb0856171e5c90a268e91ba2ae1a
2017-02-28 10:04:23 -08:00
Ryan Campbell
dbe80a6445
Merge "Support path exclusion for native coverage." am: e317a2d19e
am: 26a4ce0b65
...
am: ab93845a78
Change-Id: I94106f8b4f9f40dd3cac9fafa5f2d23931975acd
2017-02-28 02:15:26 +00:00
Ryan Campbell
ab93845a78
Merge "Support path exclusion for native coverage." am: e317a2d19e
...
am: 26a4ce0b65
Change-Id: I6cb07bbb6d4fa2b8c1e5244078dfe40e32c09581
2017-02-28 02:13:27 +00:00
Ryan Campbell
26a4ce0b65
Merge "Support path exclusion for native coverage."
...
am: e317a2d19e
Change-Id: I1b0f1d4bc0664ba5bd0f24dee8e0778d18a82504
2017-02-28 02:11:25 +00:00