OSDN Git Service
TreeHugger Robot [Thu, 23 Jun 2016 02:30:21 +0000 (02:30 +0000)]
Merge changes Ib4412657,I73e6d479 into nyc-mr1-dev
* changes:
Build: Add option to restrict sanitization by owner
Build: Add option to restrict sanitization by architecture
Andreas Gampe [Tue, 21 Jun 2016 00:46:29 +0000 (17:46 -0700)]
Build: Add option to restrict sanitization by owner
Add Make variable SANITIZE_NEVER_BY_OWNER to selectively
sanitize modules. By default, both are being sanitized. The
value of the variable is interpreted as a space or colon
separated list of owner names.
This can be used to create builds that lower the sanitization
burden by not sanitizing parts of the platform.
Bug:
29498013
Change-Id: Ib4412657fd38ff28a5c0863eddc2acde63c88ebb
Daniel Nishi [Wed, 22 Jun 2016 23:50:07 +0000 (23:50 +0000)]
Merge "Add the StorageManager APK to the core build." into nyc-mr1-dev
Badhri Jagan Sridharan [Wed, 22 Jun 2016 20:54:20 +0000 (20:54 +0000)]
Merge "releasetools: replace verity keyid" into nyc-mr1-dev
Tianjie Xu [Wed, 22 Jun 2016 05:17:40 +0000 (05:17 +0000)]
Merge \"Limit the number of blocks in command zero\" into nyc-dev
am:
0eade3f027
Change-Id: I56afbc6fed2d79d2ab71a35577739c96d779de6e
Tianjie Xu [Wed, 22 Jun 2016 05:11:24 +0000 (05:11 +0000)]
Merge "Limit the number of blocks in command zero" into nyc-dev
Zach Jang [Wed, 22 Jun 2016 01:46:17 +0000 (01:46 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb am:
e7bc1542db am:
1be6c69524
am:
1f87a820ad
Change-Id: I7fa8b6b8fc732a24d3c058d02a5568abab52028b
Zach Jang [Wed, 22 Jun 2016 01:43:47 +0000 (01:43 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb am:
e7bc1542db
am:
1be6c69524
Change-Id: If5d6ea4889550f45ef2a8f0ebf53a1e656c39010
Zach Jang [Wed, 22 Jun 2016 01:41:13 +0000 (01:41 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb
am:
e7bc1542db
Change-Id: I316c25839b0e111bda05ba586733e3712eda5a32
Zach Jang [Wed, 22 Jun 2016 01:38:31 +0000 (01:38 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2
am:
3749025ccb
Change-Id: Idadb32ede7b3699e0db8ce632d37e7d2cf99e82b
Zach Jang [Wed, 22 Jun 2016 01:35:58 +0000 (01:35 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94
am:
9fc3cf7ba2
Change-Id: Idcd5da62fd7c36da94af3a15f35d179e1a3940f2
Zach Jang [Wed, 22 Jun 2016 01:33:23 +0000 (01:33 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29
am:
cbf1e2cc94
Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
Zach Jang [Wed, 22 Jun 2016 01:30:23 +0000 (01:30 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40
am:
cf51c6cb29
Change-Id: Id5206a36ff4cee1de3e15f9d5efc64ee731434ee
Zach Jang [Wed, 22 Jun 2016 01:27:49 +0000 (01:27 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev
am:
0c672afc40
Change-Id: Ibfaa4fa1c68fff09bbee52855a99e296bb603d45
Zach Jang [Wed, 22 Jun 2016 01:23:46 +0000 (18:23 -0700)]
resolve merge conflicts of
12db224 to lmp-mr1-dev
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
Zach Jang [Wed, 22 Jun 2016 01:13:17 +0000 (18:13 -0700)]
resolve merge conflicts of
24cfbfa to lmp-dev
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
Zach Jang [Wed, 22 Jun 2016 00:44:33 +0000 (00:44 +0000)]
Updating security string to 2016-08-05 am:
5b14c1f7ce
am:
26acdf0c13
Change-Id: I5fa856d2a68d672f314f36c315c3f1857fd386ba
Zach Jang [Wed, 22 Jun 2016 00:41:51 +0000 (00:41 +0000)]
Updating security string to 2016-08-05
am:
5b14c1f7ce
Change-Id: I5b2665a6e208d676169b33c08c6761d9de8b8320
Tianjie Xu [Tue, 21 Jun 2016 22:54:09 +0000 (15:54 -0700)]
Limit the number of blocks in command zero
Limit the number of blocks in command zero to 1024 blocks. This
prevents the target size of one command from being too large and
might help to avoid fsync errors during the OTA update.
Bug:
29535618
Change-Id: Ic630cea2599138516162bd0029e2e4b2af75bf4f
(cherry picked from commit
bb848c54a78572ec2ded3e8ed05ee01f5e8290d9)
Tianjie Xu [Tue, 21 Jun 2016 23:19:12 +0000 (23:19 +0000)]
Merge "Limit the number of blocks in command zero" into nyc-mr1-dev
Tianjie Xu [Tue, 21 Jun 2016 22:54:09 +0000 (15:54 -0700)]
Limit the number of blocks in command zero
Limit the number of blocks in command zero to 1024 blocks. This
prevents the target size of one command from being too large and
might help to avoid fsync errors during the OTA update.
Bug:
29535618
Change-Id: Ic630cea2599138516162bd0029e2e4b2af75bf4f
Tao Bao [Tue, 21 Jun 2016 20:20:38 +0000 (20:20 +0000)]
Merge "releasetools: Support using payload_signer." into nyc-mr1-dev
Tao Bao [Tue, 21 Jun 2016 00:55:06 +0000 (17:55 -0700)]
releasetools: Support using payload_signer.
For A/B OTAs, by default it calls 'openssl pkeyutl' to sign the payload
and metadata with the package private key. If the private key cannot be
accessed directly, a payload signer that knows how to do that should be
supplied via "--payload_signer <signer>".
The signer will be called with "-inkey <path_to_private_key>",
"-in <input_file>" and "-out <output_file>" parameters.
Test: Use a dummy signer, call 'ota_from_target_files.py --payload_signer <signer> <target_files.zip> <ota.zip>' and verify the signatures in the generated package.
Bug:
28701652
Change-Id: I26cfdd3fdba6fc90799221741b75426988e46fd3
Andreas Gampe [Tue, 21 Jun 2016 00:36:49 +0000 (17:36 -0700)]
Build: Add option to restrict sanitization by architecture
Add Make variable SANITIZE_ARCH to selectively sanitize binaries.
This uses the "bitness," i.e., 32 or 64, to potentially filter
the sanitization. By default, both are being sanitized.
This can be used to create builds that lower the sanitization
burden by not sanitizing "half" of the platform.
Bug:
29498013
Change-Id: I73e6d479f08a970ba912f4f63967d32f3487125f
Badhri Jagan Sridharan [Fri, 17 Jun 2016 02:58:44 +0000 (19:58 -0700)]
releasetools: replace verity keyid
Replace verity keyid with the keyid extracted from cert
passed through --replace_verity_keyid. The veritykeyid in the
BOOT/cmdline of input target files is replaced with keyid
extracted from --replace_verity_keyid and written to the
output target files.
BUG:
28384658
Change-Id: Ic683f36f543c4fcd94b6f95e40f01200fbf45ee1
Zach Jang [Mon, 20 Jun 2016 21:30:52 +0000 (14:30 -0700)]
Updating security string to 2016-08-05
b/
29513589
Change-Id: I5ab4a0aa9d26a95dd0e85d87dcc487867b3f284b
Roozbeh Pournader [Sat, 18 Jun 2016 04:28:41 +0000 (21:28 -0700)]
Add Serbian in Latin script to the full locale list
Bug:
29455508
Change-Id: I3b6e889d42c41c653824cca15463466d5ccedb43
Tao Bao [Fri, 17 Jun 2016 22:03:34 +0000 (22:03 +0000)]
Merge "Replace OTA keys when signing for A/B devices." into nyc-mr1-dev
Tao Bao [Thu, 16 Jun 2016 21:41:24 +0000 (14:41 -0700)]
Replace OTA keys when signing for A/B devices.
It replaces the package verification key (change of path due to
system_root_image flag), as well as the payload verification key.
Bug:
29397395
Change-Id: I10435072aaf4356f2d8b5e1b6e82eb9cead7ad62
Vikas Marwaha [Thu, 16 Jun 2016 20:56:00 +0000 (20:56 +0000)]
Merge \"Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug:
26381401\" into nyc-dev
am:
44d50cac49
Change-Id: Ia07917cbad3d180abdb8837960f247feaec2b134
Vikas Marwaha [Thu, 16 Jun 2016 20:47:30 +0000 (20:47 +0000)]
Merge "Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug:
26381401" into nyc-dev
Mohamad Ayyash [Thu, 16 Jun 2016 20:11:45 +0000 (13:11 -0700)]
resolve merge conflicts of
8ebbc4e to nyc-mr1-dev
Change-Id: I2349bb3fede317487227b16cb7c7b093a93a3876
Mohamad Ayyash [Thu, 16 Jun 2016 16:24:33 +0000 (16:24 +0000)]
Merge "squashfs: make disable-4k-align a parameter" into nyc-dev
Tao Bao [Wed, 15 Jun 2016 00:48:11 +0000 (17:48 -0700)]
Support wiping userdata for A/B OTA packages.
update_engine now accepts POWERWASH=1 to schedule a factory reset in
the post-install phase. Hook up with the --wipe_user_data flag in the
OTA script.
Bug:
28700985
Change-Id: Ie73876a61db90d124d2af588d674757376e9aabc
Mohamad Ayyash [Wed, 15 Jun 2016 22:53:07 +0000 (15:53 -0700)]
squashfs: make disable-4k-align a parameter
BUG:
29388879
Change-Id: I121d2b76db5fb269e2f7152abb2e78098437a0d5
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Mohamad Ayyash [Wed, 15 Jun 2016 16:58:36 +0000 (16:58 +0000)]
Merge \"Pass block_list param to mksquashfs\" into nyc-dev
am:
3bddf74752
Change-Id: I713c6a60d10ef1e85475e462bb34c89751f74e7d
Tao Bao [Wed, 15 Jun 2016 16:58:35 +0000 (16:58 +0000)]
Merge \"releasetools: Disable using imgdiff for squashfs.\" into nyc-dev
am:
a8d3741f1a
Change-Id: Iec58dd45df569d4c558ed0114b576db0f5cb101a
Mohamad Ayyash [Wed, 15 Jun 2016 16:03:08 +0000 (16:03 +0000)]
Merge "Pass block_list param to mksquashfs" into nyc-dev
Mohamad Ayyash [Wed, 15 Jun 2016 16:03:08 +0000 (16:03 +0000)]
Merge "releasetools: Disable using imgdiff for squashfs." into nyc-dev
Jeff Hao [Tue, 14 Jun 2016 02:15:40 +0000 (02:15 +0000)]
Skip uses-library check for preopted apps.
am:
b00263f96a
Change-Id: I216faedc383fa289df564ba73e7ae093dad1517c
Jeff Hao [Mon, 13 Jun 2016 23:53:11 +0000 (16:53 -0700)]
Skip uses-library check for preopted apps.
Bug:
26880306
Change-Id: I97c75cceca30624b5f0c984a5032fdfaf632a90a
Tao Bao [Sat, 11 Jun 2016 19:19:23 +0000 (12:19 -0700)]
releasetools: Disable using imgdiff for squashfs.
We use imgdiff to handle files in zip format (e.g. jar/zip/apk) for
higher compression ratio.
For system/vendor in squashfs, a) all files are compressed in LZ4
format; b) we use 4096-byte block size in their sparse images, but the
files in squashfs may not be laid out as 4K-aligned. So the blocks for
a given file as listed in block map may not form a valid zip file, which
may fail the patch generation with imgdiff.
Disable using imgdiff for squashfs images, and use bsdiff instead.
Bug:
22322817
Change-Id: Ie76aa4cece5c9d38cb1d1a34c505a4a8f37512d3
Mohamad Ayyash [Mon, 13 Jun 2016 16:46:58 +0000 (09:46 -0700)]
Pass block_list param to mksquashfs
Needed to generate image.map and to optimize the OTA size
BUG:
22322817
Change-Id: I7802f4dbb9116a94ea99a00b68c3a7ff180ef08a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Tao Bao [Mon, 13 Jun 2016 16:43:44 +0000 (16:43 +0000)]
Merge "Track the name change for wipe_ab." into nyc-mr1-dev
Daniel Nishi [Fri, 10 Jun 2016 20:14:57 +0000 (13:14 -0700)]
Add the StorageManager APK to the core build.
Bug:
28965462
Change-Id: Id2877a22f0b8e675cecc0430013a008993145d6e
Tianjie Xu [Fri, 10 Jun 2016 17:30:29 +0000 (17:30 +0000)]
Add build.version.incremental to metadata
am:
d06f07eef4
Change-Id: Id13fbae7fdc6232cd44b8a3cceba0d936a890f92
Tao Bao [Fri, 10 Jun 2016 17:11:54 +0000 (10:11 -0700)]
Track the name change for wipe_ab.
Bug:
27253717
Change-Id: I0d4c91e99267afdc4846ea50e602a2383898b9b4
Tianjie Xu [Thu, 9 Jun 2016 21:18:45 +0000 (14:18 -0700)]
Add build.version.incremental to metadata
Add the build property "build.version.incremental" of the source (if
present) and target files to the metadata of the ota update package.
Example of metadata:
....
post-build-incremental=
2951741
post-timestamp=
1465345123
pre-build-incremental=
2943039
pre-device=bullhead
...
Bug:
28658632
Change-Id: I889e8ccf39633b1b35590751001a42d1b05d5514
Vineeta Srivastava [Thu, 9 Jun 2016 18:11:43 +0000 (11:11 -0700)]
Whitelist verizon as local module owner.
Change-Id: I807ac61688e6f5862de521e3c9b960dd64eed1f6
Ian Pedowitz [Wed, 8 Jun 2016 03:24:13 +0000 (20:24 -0700)]
Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"
This reverts commit
5fcdec083edf0eb3cbc8cdf05626d1713df677f1.
Bug:
29194920
Bug:
28809789
Ian Pedowitz [Wed, 8 Jun 2016 03:09:44 +0000 (03:09 +0000)]
Merge \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\" into nyc-dev
am:
ddc0c5e0a0
Change-Id: I9c08a086b508b78ddecc53e0aae08d25460f0595
Ian Pedowitz [Wed, 8 Jun 2016 03:05:39 +0000 (03:05 +0000)]
Merge "Removing N from PLATFORM_VERSION_ALL_CODENAMES" into nyc-dev
Vikas Marwaha [Tue, 7 Jun 2016 22:08:27 +0000 (15:08 -0700)]
Added make files for variable PRODUCT_SHIPPING_API_LEVEL.
Bug:
26381401
Change-Id: I8f2e630118cfa474564eb21911448bc813fcfec7
Gustav Sennton [Tue, 7 Jun 2016 16:32:33 +0000 (16:32 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
am:
837b86aa56
* commit '
837b86aa5696fea28a0acfde7361a3c5d5824624':
Add variable PRODUCT_SHIPPING_API_LEVEL.
Change-Id: I8beb5632ed9db8cade04bf8792b5874f761c039e
Gustav Sennton [Tue, 7 Jun 2016 16:21:15 +0000 (16:21 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
Ian Pedowitz [Mon, 6 Jun 2016 17:27:28 +0000 (10:27 -0700)]
resolve merge conflicts of
7a50757 to nyc-mr1-dev
Change-Id: Ia2ef0a8289d53f9eac47e42336a1fd5f01124a57
Ian Pedowitz [Wed, 1 Jun 2016 00:36:44 +0000 (17:36 -0700)]
NYC is 7.0
Bug:
29056633
Change-Id: Ib0186c5affd16b5223ba547b2cfff49d830dac1c
Ian Pedowitz [Mon, 6 Jun 2016 17:06:39 +0000 (10:06 -0700)]
Removing N from PLATFORM_VERSION_ALL_CODENAMES
Change-Id: I328dfa703faf2bd3232f68102d5c7f4b379df030
Fixes:
29117805
Narayan Kamath [Mon, 6 Jun 2016 15:23:22 +0000 (15:23 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev
am:
da147a7c20
* commit '
da147a7c20bf73f9b3736f6c479f3a8f3f56ab9e':
Add default values for pm.dexopt.core-app.
Change-Id: I11b1338f33e7e1bb99341e086bd6bcd7fb5f47f9
Narayan Kamath [Mon, 6 Jun 2016 14:48:03 +0000 (14:48 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev
Ian Pedowitz [Fri, 3 Jun 2016 19:33:43 +0000 (12:33 -0700)]
resolve merge conflicts of
f2304ce to nyc-mr1-dev
Change-Id: I0a2777aaf06ab70a1b0dfe96ff6ba6b165b0101b
Ian Pedowitz [Fri, 3 Jun 2016 18:11:03 +0000 (18:11 +0000)]
Merge "Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""" into nyc-mr1-dev
Ian Pedowitz [Tue, 31 May 2016 22:32:31 +0000 (15:32 -0700)]
NYC is now REL
PLATFORM_VERSION_ALL_CODENAMES needs to include N for now
Bug:
28810934
Bug:
29117805
Change-Id: Ibf44e1e02077e7830d9bf92b87fb8ccae029c121
Gustav Sennton [Fri, 27 May 2016 13:07:54 +0000 (14:07 +0100)]
Add variable PRODUCT_SHIPPING_API_LEVEL.
PRODUCT_SHIPPING_API_LEVEL declares which API level a device first
shipped with.
We use this variable to set a read-only property that can be used in
CTS/GTS tests.
Bug:
26381401
Change-Id: I9dfeaf423146c35f57e69ac26c27e8a9e205bc4f
Tao Bao [Thu, 2 Jun 2016 21:46:07 +0000 (21:46 +0000)]
Merge "Add support for TARGET_RECOVERY_BRICK." into nyc-mr1-dev
Narayan Kamath [Thu, 2 Jun 2016 15:34:37 +0000 (16:34 +0100)]
Add default values for pm.dexopt.core-app.
bug:
28998083
Change-Id: Iec4415ad7e5122c1168024f6ccf39b5e342cc7fd
Daniel Micay [Thu, 2 Jun 2016 02:05:15 +0000 (02:05 +0000)]
disable unpriv perf by default in user{,debug} builds
am:
888a623881
* commit '
888a6238810b4c3c00108cb92f9755e74acd9ecf':
disable unpriv perf by default in user{,debug} builds
Change-Id: Ifd28052fe19232461afe26bbde7be42f7f11d9fb
Daniel Micay [Tue, 17 May 2016 04:40:52 +0000 (00:40 -0400)]
disable unpriv perf by default in user{,debug} builds
(Cherry picked from commit
fe01f56c0d5c42508e1e82f5976e4c10bb00f632)
Bug:
29054680
Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
Tao Bao [Wed, 1 Jun 2016 06:56:23 +0000 (23:56 -0700)]
Add support for TARGET_RECOVERY_BRICK.
TARGET_RECOVERY_BRICK specifies the file that lists all the partitions
to be bricked under recovery. The file, if present, will be copied to
'$(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.brick'.
Bug:
27253717
Change-Id: Id84195b5ee1031a83bf7a077be070a3728416580
Ian Pedowitz [Tue, 31 May 2016 22:38:00 +0000 (22:38 +0000)]
Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""
This reverts commit
295ad1f1f160e229417d604e62483e1871f20f4a.
Bug:
28713307
Change-Id: Icd4d48f54840cd831780e11386a74c3e1c5ae370
Lance Chang [Sat, 28 May 2016 18:43:57 +0000 (18:43 +0000)]
Merge "Add build number to apps\' version name for non-platform build" into nyc-dev
am:
1059f37377
* commit '
1059f37377fd37cc311db522b4b5689086480d17':
Add build number to apps' version name for non-platform build
Change-Id: Ib3cbad8f4a242341319b9c3dbe0322588d63b4ea
Lance Jin-woong Chang [Sat, 28 May 2016 18:28:39 +0000 (18:28 +0000)]
Merge "Add build number to apps' version name for non-platform build" into nyc-dev
Baligh Uddin [Fri, 27 May 2016 23:48:04 +0000 (23:48 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
e718501021 am:
5d77e7e0c1 am:
9f527d5222
am:
b4e6eb0e56
* commit '
b4e6eb0e56d125321b7f5ae0141b24f7b0f4e8d7':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I55e28a9f7152c9ad8596386e50750fc3ed64bbe1
Baligh Uddin [Fri, 27 May 2016 23:45:56 +0000 (23:45 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
e718501021 am:
5d77e7e0c1
am:
9f527d5222
* commit '
9f527d52229c973fddd94b926b803a6be68ae440':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: Ie7d8b7401ee58ace28a089f97eeb4bc00c43c100
Baligh Uddin [Fri, 27 May 2016 23:42:55 +0000 (23:42 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
e718501021
am:
5d77e7e0c1
* commit '
5d77e7e0c1425c8d1ed60dd5425267ce79ef4648':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I6a242bbdf47b588064c94b90f47ffdd5dabef1cc
Baligh Uddin [Fri, 27 May 2016 23:40:04 +0000 (23:40 +0000)]
DO NOT MERGE ANYWHERE - am:
442ae0fe5c -s ours am:
a21a89051e -s ours am:
88582dfa7b -s ours
am:
3200f49a5c -s ours
* commit '
3200f49a5cff8be4ee699e08d97db7e6facd5fb0':
DO NOT MERGE ANYWHERE -
Change-Id: I5c84dbeb236627b6858edfece00e4d67f3f2fa64
Baligh Uddin [Fri, 27 May 2016 23:40:02 +0000 (23:40 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools
am:
e718501021
* commit '
e718501021dd039875745d3ff829341c2bb05248':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I25d3edc76e97f1249768bd9e9bbbecdf8fc5fe79
Baligh Uddin [Fri, 27 May 2016 23:37:47 +0000 (23:37 +0000)]
DO NOT MERGE ANYWHERE - am:
442ae0fe5c -s ours am:
a21a89051e -s ours
am:
88582dfa7b -s ours
* commit '
88582dfa7bb9be8e87b091a7fa705b6669390f8d':
DO NOT MERGE ANYWHERE -
Change-Id: Ia1ead07bfb9a89d85de883ca25c403a7b8d18042
Baligh Uddin [Fri, 27 May 2016 23:34:54 +0000 (23:34 +0000)]
DO NOT MERGE ANYWHERE - am:
442ae0fe5c -s ours
am:
a21a89051e -s ours
* commit '
a21a89051e1b4fdef4aa06f7d17f188d6fbcefe6':
DO NOT MERGE ANYWHERE -
Change-Id: I647de52990f81a5a713f1cdd6064dd4a853144d5
Baligh Uddin [Fri, 27 May 2016 23:32:09 +0000 (23:32 +0000)]
DO NOT MERGE ANYWHERE -
am:
442ae0fe5c -s ours
* commit '
442ae0fe5c76ddabe52e595689a86838820ecbf1':
DO NOT MERGE ANYWHERE -
Change-Id: I5bbd69cd7d85e3b4257d365efe07c38586d45433
Baligh Uddin [Fri, 27 May 2016 23:28:36 +0000 (16:28 -0700)]
Add system/extras/verity/build_verity_metadata.py to otatools
Bug:
29008004
Baligh Uddin [Fri, 27 May 2016 23:19:57 +0000 (23:19 +0000)]
DO NOT MERGE ANYWHERE -
Broke the build in mnc-dr-dev
Revert "Add system/extras/verity/build_verity_metadata.py to otatools"
Bug:
29008004
This reverts commit
d26a99c3c6903c02c5435ec5f0123f057527b0a9.
Change-Id: Ic56a3d382a48a68f6c6f97684c045ec943be1423
Baligh Uddin [Fri, 27 May 2016 22:52:42 +0000 (22:52 +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: Id9010ec71abb8f7db351914e2f99eec5e62f6f81
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
Bjoern Johansson [Fri, 27 May 2016 17:26:22 +0000 (17:26 +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: I4c7e6621f647c57e43db3368cb28eb4688544263
Bjoern Johansson [Fri, 27 May 2016 17:19:12 +0000 (17:19 +0000)]
Merge "Remove Dev Settings app from emulator images" into nyc-dev
Badhri Jagan Sridharan [Fri, 27 May 2016 15:46:05 +0000 (15:46 +0000)]
Merge "Extract public key ID from cert" into nyc-mr1-dev
Dirk Dougherty [Fri, 27 May 2016 00:54:18 +0000 (00:54 +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: I2538657326e83df01099859a463dc23a4b1abd96
Badhri Jagan Sridharan [Sat, 30 Apr 2016 01:20:13 +0000 (18:20 -0700)]
Extract public key ID from cert
Extracts keyid inline using openssl commands.
The keyid is passed as one of the kernel command line parameters
for the dm-android-verity module to mount root fs(system)
with verity enabled.
BUG:
28384658
Change-Id: I8efbe1b0e415ef1d396f9b51cfa4b3fa01b22484
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
Dirk Dougherty [Thu, 26 May 2016 20:05:10 +0000 (13:05 -0700)]
Fix improper date reference in blog reader.
Change-Id: I9f1a32a68da2d21ea02b95df8cd7dfc4396a445f
Lance Chang [Thu, 26 May 2016 19:32:30 +0000 (12:32 -0700)]
Add build number to apps' version name for non-platform build
If TARGET_BUILD_WITH_APPS_VERSION_NAME is defined, the build system
will add build number to the apps' default version name.
Bug:
28982976
Change-Id: I536f273b557fe7c935cc4ef1052c3297f8029863
Amanda Kassay [Thu, 26 May 2016 18:41:12 +0000 (18:41 +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: I186e9e14dfc5942a188c0bdb3e737556e9e55e17
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