openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
24,682 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

24682 Commits

Author SHA1 Message Date
Qiwen Zhao 5971fe3476 Merge commit '68e0bbf9' 
Change-Id: I04f361807f8568bc87c4d035d52594eff16955fa
 2015-08-12 18:54:45 -07:00
Dianne Hackborn 68e0bbf998 am 59a76529: am 6ff3e53f: am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev 
* commit '59a7652985c6e49478348c6643b491275f1dc8f3':
  Fix issie #23116383: Include security patch level in Settings
 2015-08-13 01:18:07 +00:00
Dianne Hackborn 59a7652985 am 6ff3e53f: am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev 
* commit '6ff3e53faaab66975674e16a1822d926c529bc5d':
  Fix issie #23116383: Include security patch level in Settings
 2015-08-13 01:09:07 +00:00
Dianne Hackborn 6ff3e53faa am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev 
* commit '897f3ba8b1cc402fca16720be345ba9c587c326b':
  Fix issie #23116383: Include security patch level in Settings
 2015-08-13 01:02:21 +00:00
Dianne Hackborn 897f3ba8b1 am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev 
* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
  Fix issie #23116383: Include security patch level in Settings
 2015-08-13 00:54:30 +00:00
Dianne Hackborn 25abc5a38e Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:58 +00:00
Nick Kralevich 0933e17bb6 am cd8f838d: am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\' 
* commit 'cd8f838d079b38d8c125396f7932c4be24063193':
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
 2015-08-13 00:10:36 +00:00
Nick Kralevich cd8f838d07 am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\' 
* commit 'c85364c9c91961461a6d81a37c8b30b34b02383b':
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
 2015-08-13 00:01:09 +00:00
Nick Kralevich c85364c9c9 am 5f79bcdd: Merge changes from topic \'file_contexts.bin\' 
* commit '5f79bcdd070f4069cd60bbe68430ee172575f9e2':
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
 2015-08-12 23:53:50 +00:00
Nick Kralevich 5f79bcdd07 Merge changes from topic 'file_contexts.bin' 
* changes:
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
 2015-08-12 23:46:28 +00:00
Dianne Hackborn e593e5c42a Fix issie #23116383: Include security patch level in Settings 
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
 2015-08-12 16:29:08 -07:00
Ian Pedowitz 01090a42ef am 28c3907d: am 35bdf149: am 7e8d6f25: am 0fd879cd: am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev 
* commit '28c3907d695786f19b6e1e8b96d4484b28a4a79b':
  Removing VisualizationWallpapers as it does not comply with API 23 rules
 2015-08-12 20:56:34 +00:00
Ian Pedowitz 28c3907d69 am 35bdf149: am 7e8d6f25: am 0fd879cd: am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev 
* commit '35bdf149e7deeea5eebb61ebd3e64261f5eb506d':
  Removing VisualizationWallpapers as it does not comply with API 23 rules
 2015-08-12 20:49:10 +00:00
Ian Pedowitz 35bdf149e7 am 7e8d6f25: am 0fd879cd: am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev 
* commit '7e8d6f2551e9d008a226af99025960d4b75189ef':
  Removing VisualizationWallpapers as it does not comply with API 23 rules
 2015-08-12 20:40:49 +00:00
Ian Pedowitz 7e8d6f2551 am 0fd879cd: am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev 
* commit '0fd879cd65f1c53c409142ca90744b1d43bdbc08':
  Removing VisualizationWallpapers as it does not comply with API 23 rules
 2015-08-12 20:31:50 +00:00
Ian Pedowitz 0fd879cd65 am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev 
* commit 'a0372e20a24283002c2d27b372194d88e1983a3f':
  Removing VisualizationWallpapers as it does not comply with API 23 rules
 2015-08-12 20:17:30 +00:00
Mike Dodd a1e7e8a5f6 am 97bb3986: am e4f29f0b: am 00e15cd5: am 09baf014: am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev 
* commit '97bb3986f5ed7cb0adaf4fbd9a7ce5ad926d4fcf':
  Revert "Include new AOSP messaging app in base builds."
 2015-08-12 19:48:55 +00:00
Ian Pedowitz a0372e20a2 Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev 2015-08-12 19:41:54 +00:00
Mike Dodd 97bb3986f5 am e4f29f0b: am 00e15cd5: am 09baf014: am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev 
* commit 'e4f29f0bb76a2f581714c082270cee7964d7004e':
  Revert "Include new AOSP messaging app in base builds."
 2015-08-12 19:18:16 +00:00
Mike Dodd e4f29f0bb7 am 00e15cd5: am 09baf014: am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev 
* commit '00e15cd5554c25ba006b355945db1cc1f00fc3c7':
  Revert "Include new AOSP messaging app in base builds."
 2015-08-12 19:14:17 +00:00
Mike Dodd 00e15cd555 am 09baf014: am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev 
* commit '09baf014917b2c59e43631e7aa4d9ef0ade80ad8':
  Revert "Include new AOSP messaging app in base builds."
 2015-08-12 19:06:07 +00:00
Mike Dodd 09baf01491 am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev 
* commit '745d11ccd077060b5d3b0e3e53682e8c1f85dd66':
  Revert "Include new AOSP messaging app in base builds."
 2015-08-12 18:58:59 +00:00
Mike Dodd 745d11ccd0 Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev 2015-08-12 18:53:47 +00:00
Mike Dodd 018500efea Revert "Include new AOSP messaging app in base builds." 
This reverts commit a8b0905e16.

Change-Id: Ia8b8eaf6576937907b073ad97593440e114c0b6f
 2015-08-12 18:48:45 +00:00
Mike Dodd c370bb53f6 am 2cd27c35: am 71fde725: am af172736: am d95990e6: am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev 
* commit '2cd27c35b4b0c86b91e734ce79bbbe2bc67f7e22':
  Include new AOSP messaging app in base builds.
 2015-08-12 18:22:06 +00:00
Mike Dodd 2cd27c35b4 am 71fde725: am af172736: am d95990e6: am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev 
* commit '71fde725b61abc637aab6be41a50353702775431':
  Include new AOSP messaging app in base builds.
 2015-08-12 18:16:07 +00:00
Ian Pedowitz 68c62e78ad Removing VisualizationWallpapers as it does not comply with API 23 rules 
Bug: 23021372
Change-Id: Ib985ac99bd9068c21f8a1c48e77c72426f69ea79
 2015-08-12 11:11:55 -07:00
Mike Dodd 71fde725b6 am af172736: am d95990e6: am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev 
* commit 'af17273684fc29af3e63f912d00c7234d2d8476a':
  Include new AOSP messaging app in base builds.
 2015-08-12 18:05:59 +00:00
Mike Dodd af17273684 am d95990e6: am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev 
* commit 'd95990e68568fe5df9e4d8981180d22d9f363a0f':
  Include new AOSP messaging app in base builds.
 2015-08-12 17:58:01 +00:00
Mike Dodd d95990e685 am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev 
* commit '02389bf940f751ffb85c8c2187a7039f0c18dad1':
  Include new AOSP messaging app in base builds.
 2015-08-12 17:49:48 +00:00
Mike Dodd 02389bf940 Merge "Include new AOSP messaging app in base builds." into mnc-dev 2015-08-12 17:01:24 +00:00
Tao Bao ecc7353308 am 820aaed6: am 68668488: am 40578b6a: am a749ea4b: am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev 
* commit '820aaed69ab9653ab676aa5a1c9cef9fd1e95684':
  Add support for clobbered blocks
 2015-08-12 07:33:31 +00:00
Tao Bao 820aaed69a am 68668488: am 40578b6a: am a749ea4b: am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev 
* commit '68668488cb32682b5f2f199e2bdf1b02eafcf7c9':
  Add support for clobbered blocks
 2015-08-12 07:27:31 +00:00
Tao Bao 68668488cb am 40578b6a: am a749ea4b: am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev 
* commit '40578b6acb42e51f93ec3d58b67daa345782e354':
  Add support for clobbered blocks
 2015-08-12 07:19:56 +00:00
Tao Bao 40578b6acb am a749ea4b: am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev 
* commit 'a749ea4b47eb3b850225ddc934d4890fc5e77600':
  Add support for clobbered blocks
 2015-08-12 07:13:30 +00:00
Tao Bao a749ea4b47 am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev 
* commit '11cf92aa37b9f51176a2055b1ff97b6211404103':
  Add support for clobbered blocks
 2015-08-12 07:03:42 +00:00
Tao Bao 11cf92aa37 am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev 
* commit '1dca55fde512f1758690fb563f1ffc9cec5f7271':
  Add support for clobbered blocks
 2015-08-12 06:55:21 +00:00
Tao Bao 1dca55fde5 skip the merge of 67e7c661 to lmp-mr1-ub-dev 
The change (007979ee) was cherry-picked from mnc-dev back to
lmp-mr1-dev. It doesn't need to flow further.

Change-Id: I0469708f1f3a0863f194a5820c7aeda4d163cbb7
 2015-08-11 23:22:37 -07:00
Tao Bao 67e7c66124 am 007979ee: Add support for clobbered blocks 
* commit '007979ee7543a396d97b3e9ada21aca44d503597':
  Add support for clobbered blocks
 2015-08-12 05:18:37 +00:00
Tao Bao 007979ee75 Add support for clobbered blocks 
In ext4 filesystems, some blocks might be changed even being mounted
R/O, such as the superblock (block 0). We need to exclude such blocks
from integrity verification. Plus such blocks should always be
written to the target by copying instead of patching.

Bug: http://b/20939131
Change-Id: If9efab3d7a0071a87b4d4297daf7963c3b818afe
(cherry picked from commit ff7778166b)
 2015-08-11 21:02:45 -07:00
Gina Dimino f229c7716a am 97b514c9: am 291232ae: am 8f301ff1: Merge "Docs: Rename content-footer-text plus remove whitespace." 
* commit '97b514c9e35c2b2c24a0650d016cef9ab46641cb':
  Docs: Rename content-footer-text plus remove whitespace.
 2015-08-12 03:26:52 +00:00
Gina Dimino 97b514c9e3 am 291232ae: am 8f301ff1: Merge "Docs: Rename content-footer-text plus remove whitespace." 
* commit '291232aea7130c96a87ca52df0eb1e0e742b1826':
  Docs: Rename content-footer-text plus remove whitespace.
 2015-08-12 03:21:27 +00:00
Gina Dimino 291232aea7 am 8f301ff1: Merge "Docs: Rename content-footer-text plus remove whitespace." 
* commit '8f301ff10d037e4305775c55ce9be6fcb93a8134':
  Docs: Rename content-footer-text plus remove whitespace.
 2015-08-12 03:14:01 +00:00
Gina Dimino 8f301ff10d Merge "Docs: Rename content-footer-text plus remove whitespace." 2015-08-12 03:05:59 +00:00
Dan Willemsen 8e29bba8c3 am ec5e3aae: resolved conflicts for merge of b184ec2a to mnc-dr-dev-plus-aosp 
* commit 'ec5e3aae6d8c89a5f6ca0a34fcdfc72e9a611188':
  Revert "Use repeatable timestamps"
 2015-08-12 01:38:06 +00:00
Dan Willemsen a635da13b2 am a3b91e62: resolved conflicts for merge of c576c08f to mnc-dr-dev-plus-aosp 
* commit 'a3b91e621c4ca1708fa2572e05e8ac5b0f4b5d17':
  Use repeatable timestamps
 2015-08-12 01:28:03 +00:00
Dan Willemsen ec5e3aae6d resolved conflicts for merge of b184ec2a to mnc-dr-dev-plus-aosp 
Change-Id: I90ac0f467ff13a038f27581cb2d07b1c5af5bd92
 2015-08-11 18:27:02 -07:00
Dan Willemsen a3b91e621c resolved conflicts for merge of c576c08f to mnc-dr-dev-plus-aosp 
Change-Id: I86f6d0e7b9def5afa618915e7249c6758a5f0d1b
 2015-08-11 18:11:48 -07:00
Dan Willemsen b184ec2a82 am 608aa91d: Merge "Revert "Use repeatable timestamps"" 
* commit '608aa91db7ef1c131e2c49b0ffd39851ff2b6e9d':
  Revert "Use repeatable timestamps"
 2015-08-12 01:07:44 +00:00
Dan Willemsen 608aa91db7 Merge "Revert "Use repeatable timestamps"" 2015-08-12 01:02:19 +00:00