OSDN Git Service
Android Build Merger (Role) [Mon, 11 Sep 2017 23:18:13 +0000 (23:18 +0000)]
Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c am:
491aaaae43" into oc-dr1-dev-plus-aosp
Siyamed Sinir [Mon, 11 Sep 2017 23:16:13 +0000 (23:16 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c
am:
491aaaae43
Change-Id: I38a64e635f6820ca5368d154363ea3414c8e047e
Jordan Liu [Mon, 11 Sep 2017 23:14:59 +0000 (23:14 +0000)]
Merge "Show 3G data icon for TD-SCDMA network type" am:
9da895b5e1
am:
2602e5ff62
Change-Id: Ifd7054cb269edbc7728e1ad561a012ff858cdad5
Siyamed Sinir [Mon, 11 Sep 2017 23:06:27 +0000 (23:06 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev
am:
846a46043c
Change-Id: I00fa802fca31e973609932fcadf49b8889f1bf00
Jordan Liu [Mon, 11 Sep 2017 23:06:22 +0000 (23:06 +0000)]
Merge "Show 3G data icon for TD-SCDMA network type"
am:
9da895b5e1
Change-Id: Idb27d11834099a13bc86619b8c3ea089fb863970
Jordan Liu [Mon, 11 Sep 2017 22:52:20 +0000 (22:52 +0000)]
Merge "Show 3G data icon for TD-SCDMA network type"
Siyamed Sinir [Mon, 11 Sep 2017 22:52:01 +0000 (22:52 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev
Adam Lesinski [Mon, 11 Sep 2017 21:59:04 +0000 (21:59 +0000)]
Merge "AAPT2: Fix processing of quotes in XML" am:
9b65f03abf
am:
9bf83b4cd1
Change-Id: Ibed7a996aed00e6e5cfdee457c40277469a95ebf
Adam Lesinski [Mon, 11 Sep 2017 21:50:55 +0000 (21:50 +0000)]
Merge "AAPT2: Fix processing of quotes in XML"
am:
9b65f03abf
Change-Id: I41709d30869830436aa833c3ab6aebe88a8caeed
Adam Lesinski [Mon, 11 Sep 2017 21:49:49 +0000 (21:49 +0000)]
Merge "Revert "OMS: fix listener callbacks triggered by changes to target package"" am:
8303fb42e0
am:
6cbee7a73c
Change-Id: I10f38277b2bdc364ea5f8caba08475badac325f4
Adam Lesinski [Mon, 11 Sep 2017 21:41:27 +0000 (21:41 +0000)]
Merge "Revert "OMS: fix listener callbacks triggered by changes to target package""
am:
8303fb42e0
Change-Id: I0d241d8d861b75c6c9350f4cf3183e82fe868309
Treehugger Robot [Mon, 11 Sep 2017 21:34:53 +0000 (21:34 +0000)]
Merge "AAPT2: Fix processing of quotes in XML"
Treehugger Robot [Mon, 11 Sep 2017 21:10:12 +0000 (21:10 +0000)]
Merge "Revert "OMS: fix listener callbacks triggered by changes to target package""
Ping Sun [Mon, 11 Sep 2017 20:28:52 +0000 (20:28 +0000)]
Merge "Add ims registration status" am:
d217a0c5a7 -s ours
am:
d850ce22f2 -s ours
Change-Id: Icd96929712b747a3c9e6e3baae65c79831420dde
Wileen Chiu [Fri, 18 Sep 2015 22:17:54 +0000 (15:17 -0700)]
Show 3G data icon for TD-SCDMA network type
- The data annunciator on the UI shows up as
"G" instead of "3G"
- Map the 3G telephony icon to network type
TD-SCDMA
Bug:
36802489
Test: manual
Change-Id: I63a0e54aab7fda2bcc6f098bb0b43799aad2f6c2
Ping Sun [Mon, 11 Sep 2017 20:11:37 +0000 (20:11 +0000)]
Merge "Add ims registration status"
am:
d217a0c5a7 -s ours
Change-Id: I79d8729bd09208fe0c1088ad1efbf491d180c2f6
Adam Lesinski [Fri, 30 Jun 2017 00:53:36 +0000 (17:53 -0700)]
AAPT2: Fix processing of quotes in XML
When processing attributes in XML, quotes can't be used to mark a
section as whitespace preserving, so the assumption should be that the
entire string is whitespace preserving, which makes quote characters
literals.
Bug:
62840718
Bug:
62840406
Test: make aapt2_tests
Change-Id: I4afff02148b5b8e78833abf1f323c2f5325d6155
Brad Ebinger [Mon, 11 Sep 2017 19:56:12 +0000 (19:56 +0000)]
Merge "Add ims registration status" into stage-aosp-master
am:
bd1f2b56bb
Change-Id: I48a9c2ead62ad023049429340789f491dcc1707d
Treehugger Robot [Mon, 11 Sep 2017 19:44:31 +0000 (19:44 +0000)]
Merge "Add ims registration status"
Brad Ebinger [Mon, 11 Sep 2017 19:42:43 +0000 (19:42 +0000)]
Merge "Add ims registration status" into stage-aosp-master
Adam Lesinski [Mon, 11 Sep 2017 19:05:04 +0000 (19:05 +0000)]
Revert "OMS: fix listener callbacks triggered by changes to target package"
Some internal tests broke due to this. Revert for now to unblock, and investigate why this occurred.
This reverts commit
f08ad98acbb83abf7d30b6583bdfc188145a4215.
Bug:
65319218
Change-Id: I1bfb2d4937708441eac2ee5909717abec10f4971
nharold [Mon, 11 Sep 2017 18:17:03 +0000 (18:17 +0000)]
Merge "Un-hide TelephonyManager.getSignalStrength()" am:
3e884ce13c
am:
447b7c49fc
Change-Id: I5c1738fca4a43b0e8c1ddd0041a00f96d32142e8
nharold [Mon, 11 Sep 2017 18:07:07 +0000 (18:07 +0000)]
Merge "Un-hide TelephonyManager.getSignalStrength()"
am:
3e884ce13c
Change-Id: I0692185c533ca4a0999cbf3237c3afabd4b87972
nharold [Mon, 11 Sep 2017 17:44:34 +0000 (17:44 +0000)]
Merge "Un-hide TelephonyManager.getSignalStrength()"
Amit Mahajan [Mon, 11 Sep 2017 17:41:41 +0000 (17:41 +0000)]
Merge "Remove config_tether_apndata for Telstra." am:
777d0cd7c3
am:
c7b4b1a9e7
Change-Id: I64bc168ec36205d4d0d0039ade8031216790327d
Amit Mahajan [Mon, 11 Sep 2017 17:31:06 +0000 (17:31 +0000)]
Merge "Remove config_tether_apndata for Telstra."
am:
777d0cd7c3
Change-Id: Iafa5e25bd94db3ce16a043a4a801ce82c97f9e13
Treehugger Robot [Mon, 11 Sep 2017 17:19:35 +0000 (17:19 +0000)]
Merge "Remove config_tether_apndata for Telstra."
Amit Mahajan [Thu, 31 Aug 2017 20:49:28 +0000 (13:49 -0700)]
Remove config_tether_apndata for Telstra.
Test: manual
Bug:
63564491
Change-Id: Iaca29bfd474b7df6489b1daeaeea182ebf8d81ae
Tony Mak [Mon, 11 Sep 2017 15:05:29 +0000 (15:05 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3 am:
4453c3cda2 am:
79a32d0a8a -s ours am:
9c358ccbe2 -s ours
am:
72bbe1d631 -s ours
Change-Id: I90da7d1636e4692adfcba36b702d8262b3fe3b4e
Tony Mak [Mon, 11 Sep 2017 14:52:59 +0000 (14:52 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3 am:
4453c3cda2 am:
79a32d0a8a -s ours
am:
9c358ccbe2 -s ours
Change-Id: I18c8460309c8330504d50eb16ce3cb39b36d2ee1
Tony Mak [Mon, 11 Sep 2017 14:43:33 +0000 (14:43 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3 am:
4453c3cda2
am:
79a32d0a8a -s ours
Change-Id: I4b97babe4f5259c71bb301d08318e09eb4560e37
Tony Mak [Mon, 11 Sep 2017 14:36:08 +0000 (14:36 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3
am:
4453c3cda2
Change-Id: Ic48643564a3685bc602c66901c9761b741b148a5
Tony Mak [Mon, 11 Sep 2017 14:28:44 +0000 (14:28 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357
am:
68cce397b3
Change-Id: Ieb10d27e72646260f0c75535485a6fe11efe2a32
Tony Mak [Mon, 11 Sep 2017 14:17:10 +0000 (14:17 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227
am:
34377e0357
Change-Id: Ief87ce5e1dc9e5b424d70e72144084aa778ca0d6
Tony Mak [Mon, 11 Sep 2017 14:04:00 +0000 (14:04 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev
am:
d7dcc3e227
Change-Id: Ie10cba479c7d83ed001b863c648976a26ae30756
Tony Mak [Mon, 11 Sep 2017 10:38:07 +0000 (11:38 +0100)]
resolve merge conflicts of
56a2b529373b to nyc-dev
Merged-In: If83d8edd0eea99145421e967ae47fdc264a5cf7c
Merged-In: I129bfe850981cf0b3646b7c1cf19c8a3ec69f512
Change-Id: I81183e5b5bc702fb245a6a51afe6709c5b9dd3de
Tony Mak [Mon, 11 Sep 2017 08:44:22 +0000 (08:44 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev am:
328c129f4c am:
a1cbcf5513
am:
220e7c1628
Change-Id: Ib882539bf0f362d3dbd279418d37b8fd56a9d8f1
Tony Mak [Mon, 11 Sep 2017 08:36:08 +0000 (08:36 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev am:
328c129f4c
am:
a1cbcf5513
Change-Id: I37cafa9ee6e166e27c074e6317a6a818fe9e87a5
Tony Mak [Mon, 11 Sep 2017 08:26:32 +0000 (08:26 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev
am:
328c129f4c
Change-Id: If2d6418cf2a71b2ae3094349101e71903c016224
TreeHugger Robot [Mon, 11 Sep 2017 08:14:19 +0000 (08:14 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev
Suprabh Shukla [Mon, 11 Sep 2017 05:49:28 +0000 (05:49 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours am:
6a48feaab8 -s ours am:
67f43835ad -s ours am:
3beb50ba24 -s ours am:
d5c753a6e5 -s ours
am:
81f4636ffa -s ours
Change-Id: I0202dee3d142d219df59547dfc571f006f9f72f2
Suprabh Shukla [Mon, 11 Sep 2017 05:35:27 +0000 (05:35 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours am:
6a48feaab8 -s ours am:
67f43835ad -s ours am:
3beb50ba24 -s ours
am:
d5c753a6e5 -s ours
Change-Id: I337f3213d40930c9b844a7eb246b184d9681703f
Suprabh Shukla [Mon, 11 Sep 2017 05:21:07 +0000 (05:21 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours am:
6a48feaab8 -s ours am:
67f43835ad -s ours
am:
3beb50ba24 -s ours
Change-Id: Ife3545f0c707b9616e5d0c6026e93bc0132a09c6
Suprabh Shukla [Mon, 11 Sep 2017 05:09:32 +0000 (05:09 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours am:
6a48feaab8 -s ours
am:
67f43835ad -s ours
Change-Id: I71f6d14cd5df5c556f4794ca581146c38d3af9c8
Suprabh Shukla [Mon, 11 Sep 2017 04:55:50 +0000 (04:55 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours
am:
6a48feaab8 -s ours
Change-Id: Ie05f69480ee2aec055dad3622072f3fc5e569e8a
Suprabh Shukla [Mon, 11 Sep 2017 04:41:52 +0000 (04:41 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours
am:
467ed9d15a -s ours
Change-Id: I81bac89584c667c35b7fff8ff3446c57c73cf617
Suprabh Shukla [Mon, 11 Sep 2017 04:29:03 +0000 (04:29 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours
am:
3f824a362f -s ours
Change-Id: Ice5595805d71402bbfbdda2efe44e180f346d54b
Suprabh Shukla [Mon, 11 Sep 2017 04:10:16 +0000 (04:10 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0
am:
4b8fb78007 -s ours
Change-Id: Idaff77e48bf3901ef0cbff54d3ceb19223a48338
Tony Mak [Mon, 11 Sep 2017 03:58:17 +0000 (03:58 +0000)]
Merge "DPC should not be allowed to grant development permission" into oc-dev am:
5e4b2b15ec
am:
f1aea743fd
Change-Id: I9d99b3f18aa86e8dd62cb9e9ec95b86b16895dbf
Sanket Padawe [Mon, 11 Sep 2017 03:51:14 +0000 (03:51 +0000)]
Merge "Deprecate TelephonyManager APIs which are present in TelecomManager." am:
a90205492f
am:
f0dd39f7d0
Change-Id: I66f4d857e4fb6e683063bb5543a992659f55a06c
Tony Mak [Mon, 11 Sep 2017 03:41:57 +0000 (03:41 +0000)]
Merge "DPC should not be allowed to grant development permission" into oc-dev
am:
5e4b2b15ec
Change-Id: I54c0be2c389aacb367b3c8c7e749475dced25f3c
Sanket Padawe [Mon, 11 Sep 2017 03:40:47 +0000 (03:40 +0000)]
Merge "Deprecate TelephonyManager APIs which are present in TelecomManager."
am:
a90205492f
Change-Id: I1d15e13cb3ae8fa8caf098e34587e3599b5bc967
Sanket Padawe [Mon, 11 Sep 2017 03:31:18 +0000 (03:31 +0000)]
Merge "Deprecate TelephonyManager APIs which are present in TelecomManager."
TreeHugger Robot [Mon, 11 Sep 2017 03:22:05 +0000 (03:22 +0000)]
Merge "DPC should not be allowed to grant development permission" into oc-dev
Suprabh Shukla [Sun, 10 Sep 2017 21:00:47 +0000 (21:00 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124 am:
25ec24740b am:
4f31a88d4b am:
bf1b7e9030 -s ours am:
84aa3f4c81 -s ours
am:
a8e0d5f73a -s ours
Change-Id: Id776a47b42146f8d9ba4419ee8872ebefac84ed3
Suprabh Shukla [Sun, 10 Sep 2017 20:47:27 +0000 (20:47 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124 am:
25ec24740b am:
4f31a88d4b am:
bf1b7e9030 -s ours
am:
84aa3f4c81 -s ours
Change-Id: I701fa204e66a8dd239e3ed3913f734e8ea503049
Suprabh Shukla [Sun, 10 Sep 2017 20:29:17 +0000 (20:29 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124 am:
25ec24740b am:
4f31a88d4b
am:
bf1b7e9030 -s ours
Change-Id: Ifcb9a5a08af1722bc5df28c470d4ca356b865acb
Suprabh Shukla [Sun, 10 Sep 2017 20:16:00 +0000 (20:16 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124 am:
25ec24740b
am:
4f31a88d4b
Change-Id: Ia97ee26a24e49809ad7484f850d256bc733ee239
Suprabh Shukla [Sun, 10 Sep 2017 20:01:33 +0000 (20:01 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124
am:
25ec24740b
Change-Id: I858f75717157bd9269bcd43d4198935302132d5a
Suprabh Shukla [Sun, 10 Sep 2017 20:00:05 +0000 (20:00 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361
am:
54f494ffc0
Change-Id: Ibbdf82686d13d9a554ef62774f140c57115118a3
Suprabh Shukla [Sun, 10 Sep 2017 19:48:10 +0000 (19:48 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229
am:
7d9e844124
Change-Id: Ifc197fbb16e1bb6773b2f08c7c62ca92f82238f7
Suprabh Shukla [Sun, 10 Sep 2017 19:47:46 +0000 (19:47 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73
am:
bf1b308361
Change-Id: Ia01d70256824947bed5e88e103bc263749404fbb
Suprabh Shukla [Sun, 10 Sep 2017 19:32:22 +0000 (19:32 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev
am:
fc9e382229
Change-Id: I80e814ed0266b3868bd7039508bbc50b2e2a51aa
Suprabh Shukla [Sun, 10 Sep 2017 19:32:12 +0000 (19:32 +0000)]
Clearing up invalid entries when SyncStorageEngine starts
am:
5470469d73
Change-Id: I8ffaaf35be0e2586a5bdbbe5de6e6bd440e26017
TreeHugger Robot [Sun, 10 Sep 2017 19:25:54 +0000 (19:25 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev
Lennart Wieboldt [Sun, 10 Sep 2017 17:52:12 +0000 (17:52 +0000)]
Merge "tests: remove LOCAL_CLANG" am:
e77be9c610
am:
24b36003d4
Change-Id: I505a6ddaa90658f0996cbaf7216023fdfa7c0409
Lennart Wieboldt [Sun, 10 Sep 2017 17:42:08 +0000 (17:42 +0000)]
Merge "tests: remove LOCAL_CLANG"
am:
e77be9c610
Change-Id: Ie2b3d0c5a6c0f30e8fd768720fb6a9e4ca45e207
Treehugger Robot [Sun, 10 Sep 2017 17:31:20 +0000 (17:31 +0000)]
Merge "tests: remove LOCAL_CLANG"
Lennart Wieboldt [Mon, 24 Jul 2017 22:20:24 +0000 (00:20 +0200)]
tests: remove LOCAL_CLANG
clang is the default compiler since Android nougat
Test: mma & verified it´s still build with clang
Change-Id: I9bfe0668eddf51dd56174fefc650a11002d38196
Signed-off-by: Lennart Wieboldt <lennart.1997@gmx.de>
Dan Willemsen [Sun, 10 Sep 2017 01:54:18 +0000 (01:54 +0000)]
Merge changes I93cf24d4,I32e438ef am:
30798ad13a
am:
c28d591b36
Change-Id: Iae6cb26ba3e2bfb644cec722462c6fd17cc708eb
Dan Willemsen [Sun, 10 Sep 2017 01:52:51 +0000 (01:52 +0000)]
Rename aapt_defaults to aapt2_defaults am:
1cb5ab2dc1 -s ours
am:
972a9d5318 -s ours
Change-Id: I50a90f1ef7d6c92771a9d43295b2809620eecfe1
Dan Willemsen [Sun, 10 Sep 2017 01:44:06 +0000 (01:44 +0000)]
Merge changes I93cf24d4,I32e438ef
am:
30798ad13a
Change-Id: I0b178c8523d0c5829d731f6ed05cfa3fe89ad9b4
Dan Willemsen [Sun, 10 Sep 2017 01:42:39 +0000 (01:42 +0000)]
Rename aapt_defaults to aapt2_defaults
am:
1cb5ab2dc1 -s ours
Change-Id: I057a428765b57394471f8d1f7488231109d8f274
Dan Willemsen [Sun, 10 Sep 2017 01:39:14 +0000 (01:39 +0000)]
Merge "Convert libhidcommand_jni to Android.bp" am:
5a1e85eb71 -s ours
am:
4731cc66e9 -s ours
Change-Id: I5d67989fe9f502fb4222948e7b8c915302986e6b
Treehugger Robot [Sun, 10 Sep 2017 01:29:21 +0000 (01:29 +0000)]
Merge changes I93cf24d4,I32e438ef
* changes:
Convert host tools to Android.bp
Rename aapt_defaults to aapt2_defaults
Dan Willemsen [Sun, 10 Sep 2017 01:27:49 +0000 (01:27 +0000)]
Merge "Convert libhidcommand_jni to Android.bp"
am:
5a1e85eb71 -s ours
Change-Id: Ida8cfe3dd910c481f47f783ed80eb8d396b29a18
Treehugger Robot [Sun, 10 Sep 2017 01:18:28 +0000 (01:18 +0000)]
Merge "Convert libhidcommand_jni to Android.bp"
Dan Willemsen [Sat, 9 Sep 2017 22:21:40 +0000 (22:21 +0000)]
Merge "Convert incident_report and incident-section-gen to Android.bp" am:
d928842ab6
am:
24041fe213
Change-Id: I0c179c30edf843c0e5bdb0eb267999f3ada39387
Dan Willemsen [Sat, 9 Sep 2017 22:11:38 +0000 (22:11 +0000)]
Merge "Convert incident_report and incident-section-gen to Android.bp"
am:
d928842ab6
Change-Id: I0e0ff3d75ce5f9dc302052c1da057db8d5d35cd7
Treehugger Robot [Sat, 9 Sep 2017 22:00:33 +0000 (22:00 +0000)]
Merge "Convert incident_report and incident-section-gen to Android.bp"
Dan Willemsen [Sat, 9 Sep 2017 19:38:40 +0000 (19:38 +0000)]
Merge changes Ia3bcece1,Icd26dc1e am:
ec462238f6
am:
c201a6bb7d
Change-Id: I3459188afc5a6d650e7f4e1a9b03e0b8edfbde71
Dan Willemsen [Sat, 9 Sep 2017 19:30:37 +0000 (19:30 +0000)]
Merge "Convert libhidcommand_jni to Android.bp" into stage-aosp-master
am:
a97f4d4ac3
Change-Id: Ifa4e6b8c415efde2dac49daf4746c19fd3b568a3
Dan Willemsen [Sat, 9 Sep 2017 19:28:33 +0000 (19:28 +0000)]
Merge changes Ia3bcece1,Icd26dc1e
am:
ec462238f6
Change-Id: Ied36c517ed7fa80dc85b07b1532821dc93628d40
Dan Willemsen [Sat, 9 Sep 2017 06:24:49 +0000 (23:24 -0700)]
Convert incident_report and incident-section-gen to Android.bp
See build/soong/README.md for more information.
Test: m incident_report incident-section-gen
Test: mmma frameworks/base
Change-Id: If1a930b40196139d29e63f6558bc4a75faca1967
Merged-In: If1a930b40196139d29e63f6558bc4a75faca1967
Dan Willemsen [Sat, 9 Sep 2017 06:23:59 +0000 (23:23 -0700)]
Convert libhidcommand_jni to Android.bp
See build/soong/README.md for more information.
Test: m libhidcommand_jni
Change-Id: Ica144979a2f89e0a9ed8eb4a816024aa318043e6
Merged-In: Ica144979a2f89e0a9ed8eb4a816024aa318043e6
Dan Willemsen [Sat, 9 Sep 2017 19:23:43 +0000 (19:23 +0000)]
Rename aapt_defaults to aapt2_defaults
am:
7544b9cbb9
Change-Id: I4ca38e0aab3fcfc4a4de900b07747e1e55936c01
Dan Willemsen [Sat, 9 Sep 2017 19:21:16 +0000 (19:21 +0000)]
Merge changes Ia3bcece1,Icd26dc1e
* changes:
Don't compile libaapt with the build number
aapt: Always use our libz
Dan Willemsen [Sat, 9 Sep 2017 19:16:34 +0000 (19:16 +0000)]
Merge "Convert libhidcommand_jni to Android.bp" into stage-aosp-master
Dan Willemsen [Sat, 9 Sep 2017 06:23:59 +0000 (23:23 -0700)]
Convert libhidcommand_jni to Android.bp
See build/soong/README.md for more information.
Test: m libhidcommand_jni
Change-Id: Ica144979a2f89e0a9ed8eb4a816024aa318043e6
Dan Willemsen [Sat, 9 Sep 2017 05:47:47 +0000 (22:47 -0700)]
Convert host tools to Android.bp
See build/soong/README.md for more information.
Test: m libinstrumentation interrupter accessorychat accessorytest bit obbtool pbkdf2gen libsplit-select_tests split-select protoc-gen-javastream validatekeymaps libaapt_tests aapt
Test: mmma frameworks/base
Test: out/host/linux-x86/nativetest64/libaapt_tests/libaapt_tests
Test: out/host/linux-x86/nativetest64/libsplit-select_tests/libsplit-select_tests
Change-Id: I93cf24d4b232353a52d53be8ed85781b8f4a3877
Dan Willemsen [Sat, 9 Sep 2017 05:44:51 +0000 (22:44 -0700)]
Rename aapt_defaults to aapt2_defaults
So that tools/aapt/Android.bp can have aapt_defaults.
Test: m aapt2
Change-Id: I32e438efb3516d73b347e67297aa09bee91520b1
Merged-In: I32e438efb3516d73b347e67297aa09bee91520b1
Dan Willemsen [Sat, 9 Sep 2017 05:44:51 +0000 (22:44 -0700)]
Rename aapt_defaults to aapt2_defaults
So that tools/aapt/Android.bp can have aapt_defaults.
Test: m aapt2
Change-Id: I32e438efb3516d73b347e67297aa09bee91520b1
Dan Willemsen [Sat, 9 Sep 2017 05:02:41 +0000 (22:02 -0700)]
Don't compile libaapt with the build number
Only do that for the aapt binary itself. This will allow libaapt to be
converted to Soong.
Also remove a few lines that weren't doing anything: aaptCppflags was
never set, LOCAL_C_INCLUDES := $(LOCAL_PATH) is implied.
Test: m aapt
Test: aapt version
Change-Id: Ia3bcece14921417e1bfd3406630961c013bd497c
Dan Willemsen [Sat, 9 Sep 2017 04:26:31 +0000 (21:26 -0700)]
aapt: Always use our libz
Instead of using the system libz (-lz), include our copy as a static
library. This is safer in case the system version isn't compatible.
Also removes references to -ldl -lrt -lpthread, which are now implied.
Test: m -j
Test: out/host/linux-x86/nativetest64/libaapt_tests/libaapt_tests
Test: out/host/linux-x86/nativetest64/aapt2_tests/aapt2_tests
Test: out/host/linux-x86/nativetest64/libsplit-select_tests/libsplit-select_tests
Change-Id: Icd26dc1e0d011e5b5f158e562640533c5ac34e33
Felipe Leme [Fri, 8 Sep 2017 21:50:25 +0000 (21:50 +0000)]
Merge "Javadoc: Added alternative to Package verification." into oc-dev am:
092349600d
am:
33d476c170
Change-Id: I6a72e1c2399fd03cd87de61964fc07e0329a8eb9
Felipe Leme [Fri, 8 Sep 2017 21:41:36 +0000 (21:41 +0000)]
Merge "Javadoc: Added alternative to Package verification." into oc-dev
am:
092349600d
Change-Id: Ic765df95fc660fb0df8a0f027d739ea999a36702
TreeHugger Robot [Fri, 8 Sep 2017 21:28:02 +0000 (21:28 +0000)]
Merge "Javadoc: Added alternative to Package verification." into oc-dev
Vinay Kalia [Fri, 8 Sep 2017 20:06:55 +0000 (20:06 +0000)]
Merge "Update ScanSettings documentation for scan modes" am:
8157ab2a0e
am:
be7ccdf6e9
Change-Id: Ib66ed6d6d6e9e1766fa4ed495d3d045b8a6384fe
Vinay Kalia [Fri, 8 Sep 2017 19:58:33 +0000 (19:58 +0000)]
Merge "Update ScanSettings documentation for scan modes"
am:
8157ab2a0e
Change-Id: I15a77489072925f6e99e9a0a658910616164aef3
Vinay Kalia [Fri, 8 Sep 2017 19:50:36 +0000 (19:50 +0000)]
Merge "Update ScanSettings documentation for scan modes"