OSDN Git Service
Baligh Uddin [Fri, 27 May 2016 22:45:39 +0000 (22:45 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
d26a99c3c6 am:
1e7c1290c6 am:
b25a7f38a8
am:
b637cb2e99
* commit '
b637cb2e996febbab295b83af8176ec39b864186':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: If3169c81ac00c80dcb3acb45a03af269009c846e
Baligh Uddin [Fri, 27 May 2016 22:43:20 +0000 (22:43 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
d26a99c3c6 am:
1e7c1290c6
am:
b25a7f38a8
* commit '
b25a7f38a876ee2f9acd90123021401ce73d3aac':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I44dd9e4662d3c4b87545f278f7b22c9535b06356
Baligh Uddin [Fri, 27 May 2016 22:40:22 +0000 (22:40 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
d26a99c3c6
am:
1e7c1290c6
* commit '
1e7c1290c68263c727d20cdfffa845fea0fdc4b1':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: Ic2f9e99d76369335edc481e6f13316bb99107e8d
Baligh Uddin [Fri, 27 May 2016 22:37:29 +0000 (22:37 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools
am:
d26a99c3c6
* commit '
d26a99c3c6903c02c5435ec5f0123f057527b0a9':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I94f04639338cdb961f3c378b12b8778c89fed232
Baligh Uddin [Fri, 27 May 2016 21:59:48 +0000 (14:59 -0700)]
Add system/extras/verity/build_verity_metadata.py to otatools
Bug:
29008004
Alex Klyubin [Fri, 27 May 2016 20:12:27 +0000 (20:12 +0000)]
Merge "Improve DataSource interface." am:
ce4c9d7108
am:
f41e840250
* commit '
f41e840250e2c0e5cce9263edbcb43fec4163d85':
Improve DataSource interface.
Change-Id: Ibf017a47be707dbd0576021832ce760a7dcaa21a
Alex Klyubin [Fri, 27 May 2016 20:07:42 +0000 (20:07 +0000)]
Merge "Improve DataSource interface."
am:
ce4c9d7108
* commit '
ce4c9d71080d27ce321b1aa49e2189ee55bb25fa':
Improve DataSource interface.
Change-Id: I8a1df06ee64785ae48414b2468e760c41d7f41f3
Alex Klyubin [Fri, 27 May 2016 20:07:40 +0000 (20:07 +0000)]
Merge "Store entry alignment information in APK." am:
85f004c6c5
am:
4ea527597e
* commit '
4ea527597e72ddff825a32fc24c6e4970d50da8f':
Store entry alignment information in APK.
Change-Id: I3ab22f58eba48743a6533265217f09ab007840f6
Alex Klyubin [Fri, 27 May 2016 20:02:10 +0000 (20:02 +0000)]
Merge "Store entry alignment information in APK."
am:
85f004c6c5
* commit '
85f004c6c5995da4f9175eb65b90f48f601d658d':
Store entry alignment information in APK.
Change-Id: I937cd36edbce072bcf329699f2bd3265205a8a11
Alex Klyubin [Fri, 27 May 2016 20:00:59 +0000 (20:00 +0000)]
Merge "Improve DataSource interface."
Alex Klyubin [Fri, 27 May 2016 19:57:11 +0000 (19:57 +0000)]
Merge "Store entry alignment information in APK."
Alex Klyubin [Fri, 27 May 2016 17:00:53 +0000 (10:00 -0700)]
Improve DataSource interface.
1. This adds way to obtain a DataSource which represents a region of
data contained in the DataSource.
2. This fixes a design bug in "feed" method where the size parameter
was an int instead of long.
3. This fixes a bug in ByteBufferDataSource where its mSize field was
a long instead of an int (ByteBuffer's length cannot be more than
2^31).
Bug:
27461702
Change-Id: Ib0812784beb581f19d2412e667b8bd018f0a3c78
Bjoern Johansson [Fri, 27 May 2016 17:24:36 +0000 (17:24 +0000)]
Merge "Remove Dev Settings app from emulator images" into nyc-dev
am:
4f2f58791f
* commit '
4f2f58791f31a66a61865e6c6095a2113609577a':
Remove Dev Settings app from emulator images
Change-Id: Ib7f40046ec64ba08055fec219107b782ebbc1340
Bjoern Johansson [Fri, 27 May 2016 17:19:12 +0000 (17:19 +0000)]
Merge "Remove Dev Settings app from emulator images" into nyc-dev
Colin Cross [Fri, 27 May 2016 00:29:14 +0000 (00:29 +0000)]
Merge "Fix mm and mmm in Android.bp directories" am:
8ed91b6624
am:
323396993c
* commit '
323396993c6651b4b98974df9e9d53118f27a840':
Fix mm and mmm in Android.bp directories
Change-Id: I95d6bde7a0ea72b47779f1a5b0577ff423524b6f
Colin Cross [Fri, 27 May 2016 00:26:30 +0000 (00:26 +0000)]
Merge "Fix mm and mmm in Android.bp directories"
am:
8ed91b6624
* commit '
8ed91b66240d3071a42365737f4cd5c7dbe601e1':
Fix mm and mmm in Android.bp directories
Change-Id: Id8d80175a2ab27c6ea5a969eb37ad12726e68376
Treehugger Robot [Fri, 27 May 2016 00:23:24 +0000 (00:23 +0000)]
Merge "Fix mm and mmm in Android.bp directories"
Dirk Dougherty [Thu, 26 May 2016 23:52:30 +0000 (23:52 +0000)]
Fix improper date reference in blog reader. am:
2732bb762a am:
0f6d425804 am:
53cd365b2d
am:
a5bce98621
* commit '
a5bce98621ef4aa7632ead4de267118f4832d6c2':
Fix improper date reference in blog reader.
Change-Id: Iedec1fc31a923e12a9733427a7ee2666c761b3e5
Dirk Dougherty [Thu, 26 May 2016 23:49:38 +0000 (23:49 +0000)]
Fix improper date reference in blog reader. am:
2732bb762a am:
0f6d425804
am:
53cd365b2d
* commit '
53cd365b2d2c2b074d628147a8a382275075bd1d':
Fix improper date reference in blog reader.
Change-Id: I300892c3c4439354917872839c18e4c029160df1
Dirk Dougherty [Thu, 26 May 2016 23:46:18 +0000 (23:46 +0000)]
Fix improper date reference in blog reader. am:
2732bb762a
am:
0f6d425804
* commit '
0f6d425804d7fd60dc82b9fe0c4ce585aa9e5eed':
Fix improper date reference in blog reader.
Change-Id: I9641b21d8841f2847836c691eba8bfb89497417d
Dirk Dougherty [Thu, 26 May 2016 23:43:35 +0000 (23:43 +0000)]
Fix improper date reference in blog reader.
am:
2732bb762a
* commit '
2732bb762a00828f36bda77c43c7fd14c7495cde':
Fix improper date reference in blog reader.
Change-Id: I5ff0d1d2b16ae712b6e92ef64c023574d2e7bfe5
Colin Cross [Thu, 26 May 2016 22:32:15 +0000 (15:32 -0700)]
Fix mm and mmm in Android.bp directories
mm and mmm were not parsing out/soong/Android.mk, so they were ignoring
all modules defined in an Android.bp file. Always include
out/soong/Android.mk when ONE_SHOT_MAKEFILE is set, and convert the mm
and mmm functions to build MODULES-IN-$DIR instead of all_modules so
that only the subset of modules defined in out/soong/Android.mk for the
requested directory are built.
Bug:
28986194
Change-Id: I6e1ff8cacfc668a4154a0d5937450db840bb7a6b
Dan Willemsen [Thu, 26 May 2016 22:01:20 +0000 (15:01 -0700)]
resolve merge conflicts of
dfcf2e0 to nyc-dev-plus-aosp
Change-Id: I5473ac42db3dba12dffb1d40eb9096d738ef977b
Dan Willemsen [Thu, 26 May 2016 21:52:54 +0000 (21:52 +0000)]
Merge "Remove unnecessary variables"
am:
2eb45d9ab2
* commit '
2eb45d9ab29b0923aeeea51ae0c58e32fea23941':
Remove unnecessary variables
Change-Id: I645c34edb93ce262d245867c4efea2d409366a09
Dan Willemsen [Thu, 26 May 2016 21:49:01 +0000 (21:49 +0000)]
Merge "Remove unnecessary variables"
Dirk Dougherty [Thu, 26 May 2016 20:05:10 +0000 (13:05 -0700)]
Fix improper date reference in blog reader.
Change-Id: I9f1a32a68da2d21ea02b95df8cd7dfc4396a445f
Amanda Kassay [Thu, 26 May 2016 18:36:55 +0000 (18:36 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback." am:
8bac6eb880 am:
0eefec03a7 am:
ecaacf87cd
am:
7bea848abd
* commit '
7bea848abda31862aad104657f87859b7e67677d':
Revert "Updated default.css and docs.js for DoD transition fallback."
Change-Id: If9055f540e174fde5732f36fd47eec0ed2d1f7cb
Amanda Kassay [Thu, 26 May 2016 18:33:54 +0000 (18:33 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback." am:
8bac6eb880 am:
0eefec03a7
am:
ecaacf87cd
* commit '
ecaacf87cd038beb4aad5d6ddc6c1cc1725dca4a':
Revert "Updated default.css and docs.js for DoD transition fallback."
Change-Id: I07e3e36f3dd322fde3067e63a66ac9f5e87e7385
Amanda Kassay [Thu, 26 May 2016 18:28:40 +0000 (18:28 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback." am:
8bac6eb880
am:
0eefec03a7
* commit '
0eefec03a76e5e0201293331dd67baf52dc13ceb':
Revert "Updated default.css and docs.js for DoD transition fallback."
Change-Id: I9dc0292d9615d5cd1f888a4ac92b45b0b3d6ffb4
Amanda Kassay [Thu, 26 May 2016 18:22:56 +0000 (18:22 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback."
am:
8bac6eb880
* commit '
8bac6eb880992e0a4dd37b0f1cf039feebb483ae':
Revert "Updated default.css and docs.js for DoD transition fallback."
Change-Id: I33f169f14f2e7b993e30c00fe59016357242f288
Amanda Kassay [Thu, 26 May 2016 17:58:23 +0000 (17:58 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback."
This reverts commit
4d5bcbf62a0cc6ec1db0c860a818b6166dceed74.
Change-Id: I45dc33a7711f435fd35b51bb0cb44445e6edd918
Dan Willemsen [Tue, 17 May 2016 05:07:31 +0000 (22:07 -0700)]
Remove unnecessary variables
These are all either recently unused due to the removal of CFLAGS/etc,
or have been exported by Soong and are no longer necessary.
Change-Id: I5930d43fda21acc8202b3d8ea010fbefb6ae4cf1
Bjoern Johansson [Thu, 26 May 2016 01:26:14 +0000 (18:26 -0700)]
Remove Dev Settings app from emulator images
The Dev Settings app currently just launches an intent that is received
by the regular Settings app. However, since N the Settings app only
receives the intent when developer mode is enabled. If it is not enabled
the Dev Settings app will crash. Since the Dev Settings app doesn't
really add much benefit this change removes it from the emulator system
images to prevent this issue. The user will have to access the developer
settings from the regular Settings app just like on a physical device.
BUG:
27549126
Change-Id: I8191f9003bb452ef76c4b236b965368b48be3d25
Adam Powell [Thu, 26 May 2016 01:19:57 +0000 (01:19 +0000)]
Merge "N is API 24" into nyc-dev
am:
f211cae2ed
* commit '
f211cae2ede701b58228ff0090bb894f17c0557f':
N is API 24
Change-Id: Id4970239ff53cf27c7d3aa547da383d3f80d2ec9
Colin Cross [Thu, 26 May 2016 01:04:52 +0000 (01:04 +0000)]
Merge "Remove USE_SOONG=false option" am:
5413fb4b3e
am:
a36de73331
* commit '
a36de73331b92e5e75ba92e7a4707e5850e3486d':
Remove USE_SOONG=false option
Change-Id: Iba393dadd32a55e910cf0ab980a1e82887f60bb9
TreeHugger Robot [Thu, 26 May 2016 01:03:06 +0000 (01:03 +0000)]
Merge "N is API 24" into nyc-dev
Colin Cross [Thu, 26 May 2016 00:57:54 +0000 (00:57 +0000)]
Merge "Remove USE_SOONG=false option"
am:
5413fb4b3e
* commit '
5413fb4b3e2310be8568f5024fdc4d0900bf9f9e':
Remove USE_SOONG=false option
Change-Id: I83c44d57917a10838dd9626d382b4e992c58f822
Colin Cross [Thu, 26 May 2016 00:46:39 +0000 (00:46 +0000)]
Merge "Remove USE_SOONG=false option"
Adam Powell [Wed, 25 May 2016 23:48:56 +0000 (16:48 -0700)]
N is API 24
Change-Id: I8e4fbc1d64a6cd3eb0b4765f696ae48170264d52
Zach Jang [Wed, 25 May 2016 21:11:13 +0000 (21:11 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0 am:
bf5d08ecf4 am:
db34ed5f83 am:
4af9b20fbd am:
cf227d4401
am:
e29b42ffef
* commit '
e29b42ffef47991c090ca8008a9addb9e479fc2a':
Updating security string to 2016-07-05
Change-Id: Ia97a6f74950118f48e0dd48fd3fe00684ce405af
Tianjie Xu [Wed, 25 May 2016 21:11:12 +0000 (21:11 +0000)]
Merge "Report error codes in the OTA update script" into nyc-dev
am:
654e4fb023
* commit '
654e4fb02368b05cbfba3246b4c634512fa84464':
Report error codes in the OTA update script
Change-Id: I333bd45886d5915858b762e086d8a263f81b26e2
Zach Jang [Wed, 25 May 2016 21:02:20 +0000 (21:02 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0 am:
bf5d08ecf4 am:
db34ed5f83 am:
4af9b20fbd
am:
cf227d4401
* commit '
cf227d440176f5c10b252ff75fdc6aabf7d4829d':
Updating security string to 2016-07-05
Change-Id: Iffcc0c0b77df8d1bbb69bfd69f9ef0818e469c68
Zach Jang [Wed, 25 May 2016 20:57:45 +0000 (20:57 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours am:
4c9d484078 am:
2823643ecd am:
d5e1f1ee8e am:
6a974cf124 -s ours
am:
18fb257140
* commit '
18fb25714020b3016e2a8c6d0edd01f8006783f8':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I12ebdd882302a54439b304aca23e7467a0061d11
Zach Jang [Wed, 25 May 2016 20:57:41 +0000 (20:57 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0 am:
bf5d08ecf4 am:
db34ed5f83
am:
4af9b20fbd
* commit '
4af9b20fbd847ffab365a4677de0e9752737c4f3':
Updating security string to 2016-07-05
Change-Id: I9e5d40dc3710efa07a7fa365d99f3bf6d6dc2109
Tianjie Xu [Wed, 25 May 2016 20:57:20 +0000 (20:57 +0000)]
Merge "Report error codes in the OTA update script" into nyc-dev
Zach Jang [Wed, 25 May 2016 20:52:58 +0000 (20:52 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours am:
4c9d484078 am:
2823643ecd am:
d5e1f1ee8e
am:
6a974cf124 -s ours
* commit '
6a974cf124727c19496f202576b7520cd22175d1':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I268b1e3d67c2b8cf579c5b88d582ab3b93592aec
Zach Jang [Wed, 25 May 2016 20:52:57 +0000 (20:52 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0 am:
bf5d08ecf4
am:
db34ed5f83
* commit '
db34ed5f83efc646f37eae8ee61233ee2c2e4979':
Updating security string to 2016-07-05
Change-Id: I9fa607cd71960ac309a5a791e8572a7e183a54d0
Zach Jang [Wed, 25 May 2016 20:44:23 +0000 (20:44 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours am:
4c9d484078 am:
2823643ecd
am:
d5e1f1ee8e
* commit '
d5e1f1ee8e3ba4051785fd7bc2b2ec384870a829':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I93652c1e6e3bc3b8a2bd48a50cb8f1dbafac9d59
Zach Jang [Wed, 25 May 2016 20:44:22 +0000 (20:44 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0
am:
bf5d08ecf4
* commit '
bf5d08ecf4cce47611ee58dbe6b0685e04725c87':
Updating security string to 2016-07-05
Change-Id: I7de8ef605de344ceba9e634ea4f7eb127b91fcf7
Zach Jang [Wed, 25 May 2016 20:39:29 +0000 (20:39 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours am:
4c9d484078
am:
2823643ecd
* commit '
2823643ecdbfd8ad700834dd292fa2b827072634':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I1a9612e6c22d631d634cdab47a733e0e22b285a4
Zach Jang [Wed, 25 May 2016 20:39:28 +0000 (20:39 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad
am:
7cc20fe0a0
* commit '
7cc20fe0a058f3e2e323da12b0d5eb3c5d6311cb':
Updating security string to 2016-07-05
Change-Id: I365f9fb0c5e2a29bbf93ea6476d3d697998b90b3
Zach Jang [Wed, 25 May 2016 20:34:47 +0000 (20:34 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours
am:
4c9d484078
* commit '
4c9d484078d45bef09147e5beaf475f9aba96eb4':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: If826c11507df71dc36228d0b5b845078080e37a2
Zach Jang [Wed, 25 May 2016 20:34:46 +0000 (20:34 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f
am:
e7660e56ad
* commit '
e7660e56ad330c8469857014c448130143c86856':
Updating security string to 2016-07-05
Change-Id: I88edd89acdbdd63433fb595a2c7e7a048cd9cdfe
Zach Jang [Wed, 25 May 2016 20:30:15 +0000 (20:30 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4
am:
afbf826576 -s ours
* commit '
afbf826576540aa15310d018235f90f8cfd6c6fc':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I83310642258499e75c191cc9969da5ffa2d91c3d
Zach Jang [Wed, 25 May 2016 20:30:14 +0000 (20:30 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev
am:
ab6c08949f
* commit '
ab6c08949f2a96867b1eda536eeb74982a49d5d3':
Updating security string to 2016-07-05
Change-Id: I2357ba1f5ba742ffdeed1fbcd9359405cbb436d8
Zach Jang [Wed, 25 May 2016 20:25:14 +0000 (20:25 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff
am:
e496a955f4
* commit '
e496a955f40fafb3073f7aef8be89c704ce0f01c':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I24dd5be0560f7b6826dfd4700510f2517f1604ff
Zach Jang [Wed, 25 May 2016 20:21:24 +0000 (20:21 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev
Zach Jang [Wed, 25 May 2016 20:20:57 +0000 (20:20 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours
am:
1fc50f59ff
* commit '
1fc50f59ff732131122d8fbcdbb497561e434364':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I65cc7edc2d2b69fb7d3fc3745dc3662ddb59be63
Zach Jang [Wed, 25 May 2016 20:16:34 +0000 (20:16 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours
am:
79770b1927 -s ours
* commit '
79770b192771b7e332f1537fef3e3719b07bcf14':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ie757679100cd217973d8371de8a72adc89392bbc
Zach Jang [Wed, 25 May 2016 20:11:54 +0000 (20:11 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a
am:
60270ec785 -s ours
* commit '
60270ec78531308f91221ca09c74edee6701ec34':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ia89f4840478991109628844f889e6c97677b0d50
Zach Jang [Wed, 25 May 2016 20:07:30 +0000 (20:07 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375
am:
555c5af89a
* commit '
555c5af89a4b25f61ff827431b0081be7b70d5fe':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I7f662a6d72179678beee82b3cfb87525eae2b2c2
Zach Jang [Wed, 25 May 2016 20:03:05 +0000 (20:03 +0000)]
DO NOT MERGE Updating security string to 2016-07-05
am:
f885e95375
* commit '
f885e95375a48aeefd7d2451a5c61a48100bac77':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ic58e87cd25747728aa105047cf81a32253d4aba4
Colin Cross [Wed, 25 May 2016 19:55:43 +0000 (12:55 -0700)]
Remove USE_SOONG=false option
Soong is always required to build now.
Change-Id: I4e310e98e912b370ebf980bf609f04212a7e9a50
Zach Jang [Wed, 25 May 2016 19:41:59 +0000 (12:41 -0700)]
DO NOT MERGE Updating security string to 2016-07-05
b/
28912173
Change-Id: I81301d51fd62932005a24178c57a0731566910a6
Zach Jang [Wed, 25 May 2016 19:38:46 +0000 (12:38 -0700)]
Updating security string to 2016-07-05
b/
28912173
Change-Id: I5dafe754c226eeb3f0beb3b23b219df2b82ef372
Tianjie Xu [Wed, 25 May 2016 00:34:52 +0000 (17:34 -0700)]
Report error codes in the OTA update script
Modify the abort() function in the OTA update generation script to
report an error code. The recoveryimage will parse the code and write it
into last_install for further data analysis.
Bug:
28934032
Change-Id: I2d62f81fd352c3102fb84f054972ac0ecb965a21
Nick Kralevich [Wed, 25 May 2016 05:17:42 +0000 (05:17 +0000)]
goldfish_setup: grant /system/bin/sh exec access
am:
501c88c029
* commit '
501c88c0290eb2308c110398f106411260863bb8':
goldfish_setup: grant /system/bin/sh exec access
Change-Id: I9cf86d98f355342416a584ca74ac189f1873c6d7
Nick Kralevich [Wed, 25 May 2016 00:36:23 +0000 (17:36 -0700)]
goldfish_setup: grant /system/bin/sh exec access
The goldfish_setup shell script needs the ability to execute
the shell script interpreter. Allow it.
Addresses the following denial:
avc: denied { getattr } for pid=1220 comm="init.goldfish.s"
path="/system/bin/sh" dev="vda" ino=442 scontext=u:r:goldfish_setup:s0
tcontext=u:object_r:shell_exec:s0 tclass=file permissive=0
Bug:
28941573
Change-Id: I22d26e90f107c8d801229354a5e0513c37e6c31d
Zach Jang [Tue, 24 May 2016 01:34:45 +0000 (01:34 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7 am:
8ebaeae1f6 -s ours am:
9ae8c7356e am:
bc60af7bfd am:
37e618fef8 am:
c3d3f6bad9 -s ours
am:
2af23a3c20
* commit '
2af23a3c208b4480998923edc1479919093bc6b9':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I6e47f286c2aed162fc63e1ea9535085d21b9dc72
Zach Jang [Tue, 24 May 2016 01:32:29 +0000 (01:32 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7 am:
8ebaeae1f6 -s ours am:
9ae8c7356e am:
bc60af7bfd am:
37e618fef8
am:
c3d3f6bad9 -s ours
* commit '
c3d3f6bad9371e7d4b1cdf100b17692e9dc2922e':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I3c573b10baba8ebd7b881b5f5bd4ebb10633a9a9
Zach Jang [Tue, 24 May 2016 01:29:38 +0000 (01:29 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7 am:
8ebaeae1f6 -s ours am:
9ae8c7356e am:
bc60af7bfd
am:
37e618fef8
* commit '
37e618fef8922f6a5790e2cf83f28ee48c46a213':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: Ifb8352e7397a3a80ce5041bf74e95c609cc7c754
Zach Jang [Tue, 24 May 2016 01:27:10 +0000 (01:27 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7 am:
8ebaeae1f6 -s ours am:
9ae8c7356e
am:
bc60af7bfd
* commit '
bc60af7bfd4e7190086d59eea53b3dcf3cf40a6d':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I4ce025692a6e6c0c96d5657d99131c306a742da4
Zach Jang [Tue, 24 May 2016 01:22:07 +0000 (01:22 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7 am:
8ebaeae1f6 -s ours
am:
9ae8c7356e
* commit '
9ae8c7356efd1eadb9e4043d96cc5dc28ba554b6':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I67fe439474ce9edd47194a926719b71b846a2a56
Zach Jang [Tue, 24 May 2016 01:22:07 +0000 (01:22 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b am:
1dd3095e78 am:
0b4608ca4d am:
3e082f1e64 am:
608f329e07 am:
2d75d4447c am:
3ffee87b5c
am:
f8a869d5d8
* commit '
f8a869d5d8a3989e240cde063322f9441ad35d16':
Updating security string to 2016-07-01
Change-Id: I41563d0fad2be27309de6890d472ebe1e279533a
Zach Jang [Tue, 24 May 2016 01:19:54 +0000 (01:19 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b am:
1dd3095e78 am:
0b4608ca4d am:
3e082f1e64 am:
608f329e07 am:
2d75d4447c
am:
3ffee87b5c
* commit '
3ffee87b5cd468aa5bf14a3e326aa080948db4f3':
Updating security string to 2016-07-01
Change-Id: Id3468f4dbeb626ad3289f5acef32a72e3e18201b
Zach Jang [Tue, 24 May 2016 01:19:37 +0000 (01:19 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7
am:
8ebaeae1f6 -s ours
* commit '
8ebaeae1f6f0a69fc1bf518558fa463ed0cca6de':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I07650552a45e5e2de1524b43839c895283d17c4a
Zach Jang [Tue, 24 May 2016 01:17:01 +0000 (01:17 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b
am:
3cba9b15f7
* commit '
3cba9b15f7ce25e194a305d37d27424e6923fd4b':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: Ib7e12ebb1a9140084a1e3aa28cede2809499004e
Zach Jang [Tue, 24 May 2016 01:17:01 +0000 (01:17 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b am:
1dd3095e78 am:
0b4608ca4d am:
3e082f1e64 am:
608f329e07
am:
2d75d4447c
* commit '
2d75d4447ca47666b20fe91e595a3274c8a975cf':
Updating security string to 2016-07-01
Change-Id: I59ad6e51072d854b052873a0ec32d8de2cdf5a1d
Zach Jang [Tue, 24 May 2016 01:14:26 +0000 (01:14 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours
am:
8b961c808b
* commit '
8b961c808b6c67d464f4c070ea46b8a0650595d5':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: Id5916f2fa84a2fee99a37a1a8b9fd07d8c58ae0b
Zach Jang [Tue, 24 May 2016 01:14:26 +0000 (01:14 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b am:
1dd3095e78 am:
0b4608ca4d am:
3e082f1e64
am:
608f329e07
* commit '
608f329e0718a9ef3ed89b3f9d4768b003bc88de':
Updating security string to 2016-07-01
Change-Id: I93c86db7e020f586784f8a8b106806dbb7874d76
Zach Jang [Tue, 24 May 2016 01:11:45 +0000 (01:11 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours
am:
e495d379de -s ours
* commit '
e495d379decdfea93789c4693dd0f96aac23c34d':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I1749805100b45f8f12cac476df8e7be3380fbd54
Zach Jang [Tue, 24 May 2016 01:11:45 +0000 (01:11 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b am:
1dd3095e78 am:
0b4608ca4d
am:
3e082f1e64
* commit '
3e082f1e649821f00ec751824e901f64a2756269':
Updating security string to 2016-07-01
Change-Id: I5c04b6e42927d45c9bf0e2f842cd9eac8f62dfa5
Zach Jang [Tue, 24 May 2016 01:09:15 +0000 (01:09 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b am:
1dd3095e78
am:
0b4608ca4d
* commit '
0b4608ca4d8b10af335f839350a4224a198e8dee':
Updating security string to 2016-07-01
Change-Id: I08d096476c645d304ab5038cd5ca586073424157
Zach Jang [Tue, 24 May 2016 01:09:14 +0000 (01:09 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3
am:
2ee84bf0a5 -s ours
* commit '
2ee84bf0a56984323154411d60096b691c66b841':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I7a2c2f1d707eb14b56b8e5227724427bdf0e2768
Zach Jang [Tue, 24 May 2016 01:06:37 +0000 (01:06 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01
am:
0bdac8fba3
* commit '
0bdac8fba335f4e1620871bf5082dbebc55a497d':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I9c2b97af248ab4007fbfce8d67f9f70b5016687f
Zach Jang [Tue, 24 May 2016 01:06:37 +0000 (01:06 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b
am:
1dd3095e78
* commit '
1dd3095e780dc83aa1b4056f298a4678bead075a':
Updating security string to 2016-07-01
Change-Id: Id2e67d174cc1c79cbc418089aa7870ff38102a08
Zach Jang [Tue, 24 May 2016 01:02:06 +0000 (01:02 +0000)]
Updating security string to 2016-07-01
am:
45ff24a04b
* commit '
45ff24a04bd5d3af706ae3aa6266106560070a3d':
Updating security string to 2016-07-01
Change-Id: I426da21a6ba7c2e62a7f57765c0c35063d151ad4
Zach Jang [Tue, 24 May 2016 01:02:05 +0000 (01:02 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
am:
89f6f7aa01
* commit '
89f6f7aa01591e8524ef0c4b5efa7433d082a9b9':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I0e07966827713405ac2145a44185fe2f485c6e62
Alex Klyubin [Mon, 23 May 2016 21:19:51 +0000 (14:19 -0700)]
Store entry alignment information in APK.
Data of uncompressed APK entries is often aligned to a multiple of 4
or 4096 in the APK to make it easier to mmap the data. Unfortunately,
the current method for achieving alignment suffers from two issues:
(1) the way it uses the Local File Header extra field is not compliant
with ZIP format (for example, this prevents older versions of Python's
zipfile from reading APKs: https://bugs.python.org/issue14315), and
(2) it does not store information about the alignment multiple in the
APK, making it harder/impossible to preserve the intended alignment
when rearranging entries in the APK.
This change solves these issues by switching to a different method for
aligning data of uncompressed APK entries. Same as before, alignment
is achieved using Local File Header entry field. What's different is
that alignment is achieved by placing a well-formed extensible data
field/block into the extra field. The new field/block contains the
alignment multiple (e.g., 4 or 4096) as well as the necessary padding
(if any). Compared to the original alignment method, the new method
uses 6 more bytes for each uncompressed entry.
Bug:
27461702
Change-Id: I8cffbecc50bf634b28fca5bc39eb23f671961cf9
Vishwath Mohan [Mon, 23 May 2016 22:29:50 +0000 (22:29 +0000)]
Merge "Double quote some statements for zsh compatibility" am:
576fd3ebb9
am:
29c2c4db19
* commit '
29c2c4db19c6c9f152a1c48aee368a3439cd195f':
Double quote some statements for zsh compatibility
Change-Id: Id02db06a190370d18e3b7828a453cd16948d77c1
Vishwath Mohan [Mon, 23 May 2016 22:25:45 +0000 (22:25 +0000)]
Merge "Double quote some statements for zsh compatibility"
am:
576fd3ebb9
* commit '
576fd3ebb92d2200ea8c02cd6f3b7ba21ced9030':
Double quote some statements for zsh compatibility
Change-Id: I30ff4c9d527907772d11d557097fafb2cbeeb590
Colin Cross [Mon, 23 May 2016 22:21:46 +0000 (22:21 +0000)]
Merge "Error on USE_CLANG_PLATFORM_BUILD=" am:
7b31dd1094
am:
893f32053f
* commit '
893f32053f78def4582ceb54b19ddb1253b73495':
Error on USE_CLANG_PLATFORM_BUILD=
Change-Id: Ibc43aee7aecb6526436be08e78622a2e4690e71c
Vishwath Mohan [Mon, 23 May 2016 22:17:35 +0000 (22:17 +0000)]
Merge "Double quote some statements for zsh compatibility"
Colin Cross [Mon, 23 May 2016 22:17:34 +0000 (22:17 +0000)]
Merge "Error on USE_CLANG_PLATFORM_BUILD="
am:
7b31dd1094
* commit '
7b31dd10948abccc9c8b2f949edbe84de15702d5':
Error on USE_CLANG_PLATFORM_BUILD=
Change-Id: Iea742a5cd8230587656460cc5ad6b979ba2189a5
Colin Cross [Mon, 23 May 2016 22:05:27 +0000 (22:05 +0000)]
Merge "Error on USE_CLANG_PLATFORM_BUILD="
Dan Willemsen [Mon, 23 May 2016 21:32:01 +0000 (21:32 +0000)]
Merge "Add LOCAL_CTS_GTEST_LIST_EXECUTABLE" am:
c11ae6c569
am:
8b0af507d9
* commit '
8b0af507d97b4e93bbe8d6afbc33d7840478729e':
Add LOCAL_CTS_GTEST_LIST_EXECUTABLE
Change-Id: Ibb4ff3b5b972ed3f7a35c122b6da1ee18de1212f
Dan Willemsen [Mon, 23 May 2016 21:28:36 +0000 (21:28 +0000)]
Merge "Add LOCAL_CTS_GTEST_LIST_EXECUTABLE"
am:
c11ae6c569
* commit '
c11ae6c569c26607a165e6fe491008bdd272d981':
Add LOCAL_CTS_GTEST_LIST_EXECUTABLE
Change-Id: Id305d60c8db698fa90b09fb547f606b62bb37ad9
Treehugger Robot [Mon, 23 May 2016 21:18:57 +0000 (21:18 +0000)]
Merge "Add LOCAL_CTS_GTEST_LIST_EXECUTABLE"
Andreas Gampe [Mon, 23 May 2016 20:48:00 +0000 (20:48 +0000)]
Merge "Build: Only use compiled-classes file when available" into nyc-dev
am:
57c3aea442
* commit '
57c3aea442bff67e4452eee7ff8f13294fbad34b':
Build: Only use compiled-classes file when available
Change-Id: I9a3ae7385483f9f5d934d8cd6660c17c57529989
Vikas Marwaha [Mon, 23 May 2016 20:39:56 +0000 (20:39 +0000)]
Merge "Build: Only use compiled-classes file when available" into nyc-dev
OSDN Git Service
