OSDN Git Service
Tao Bao [Fri, 24 Jun 2016 05:30:30 +0000 (05:30 +0000)]
Merge \\"releasetools: replace verity keyid\\" am:
6efa887f9b
am:
45d28d7392
Change-Id: I2104805b0de9ca28fde19f2c460b540977260dc2
Tao Bao [Fri, 24 Jun 2016 05:30:30 +0000 (05:30 +0000)]
Merge \\"Replace OTA keys when signing for A/B devices.\\" am:
f2c34ece3c
am:
deb116a65d
Change-Id: Ib57f472bdd232a908e0399dc1365f9aaf8ddf3ba
Badhri Jagan Sridharan [Fri, 24 Jun 2016 05:27:01 +0000 (05:27 +0000)]
Merge \"releasetools: replace verity keyid\"
am:
6efa887f9b
Change-Id: I63b11e2e0d27100a58a05ea91c0e7c29bb0597ff
Tao Bao [Fri, 24 Jun 2016 05:27:00 +0000 (05:27 +0000)]
Merge \"Replace OTA keys when signing for A/B devices.\"
am:
f2c34ece3c
Change-Id: I7eb287bd486d197b3c2c96616b558e7bc9536329
Tao Bao [Fri, 24 Jun 2016 05:19:40 +0000 (05:19 +0000)]
Merge "releasetools: replace verity keyid"
Tao Bao [Fri, 24 Jun 2016 05:19:22 +0000 (05:19 +0000)]
Merge "Replace OTA keys when signing for A/B devices."
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
(cherry picked from commit
b58d23fe00697a0cf9c7c9c75639fd8c7b5bb016)
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
(cherry picked from commit
24a72064309dd55d4aa80b70480eed55c54f818d)
Daniel Micay [Fri, 24 Jun 2016 03:40:22 +0000 (03:40 +0000)]
resolve merge conflicts of
012144f to nyc-dev
am:
bb9a8d8eb8
Change-Id: I140f5b3da3b65cd35cd7eb00d8406870f3c0c4ca
Jeff Vander Stoep [Thu, 23 Jun 2016 22:04:24 +0000 (15:04 -0700)]
resolve merge conflicts of
012144f to nyc-dev
Change-Id: If918f56d5c33db10978b4efc51cf3fe42ed71f1a
Daniel Micay [Thu, 23 Jun 2016 21:10:35 +0000 (21:10 +0000)]
Merge \\\"disable unpriv perf by default in user{,debug} builds\\\" into mnc-dev am:
11c84f95fb am:
a0c61fc832
am:
3cceebf11e
Change-Id: Ia91276546041b5e36ddeeb4d855d8efac6101da5
Jeffrey Vander Stoep [Thu, 23 Jun 2016 21:07:28 +0000 (21:07 +0000)]
Merge \\"disable unpriv perf by default in user{,debug} builds\\" into mnc-dev am:
11c84f95fb
am:
a0c61fc832
Change-Id: I3eb533e3084fe53f1739a0428ffe5ff583b1ba91
Daniel Micay [Thu, 23 Jun 2016 21:04:53 +0000 (21:04 +0000)]
Merge \"disable unpriv perf by default in user{,debug} builds\" into mnc-dev
am:
11c84f95fb
Change-Id: Ic82b49068c2d6c834bafb01ea3f698bb9e84d1ac
Jeffrey Vander Stoep [Thu, 23 Jun 2016 21:00:03 +0000 (21:00 +0000)]
Merge "disable unpriv perf by default in user{,debug} builds" into mnc-dev
Alex Klyubin [Thu, 23 Jun 2016 00:40:11 +0000 (00:40 +0000)]
Merge \\"Use Builder pattern for ApkVerifier parameters.\\" am:
744e7746c4
am:
7dbd1ea408
Change-Id: I425095197f451a3ea089cea75da13fbb01036f43
Alex Klyubin [Thu, 23 Jun 2016 00:37:28 +0000 (00:37 +0000)]
Merge \"Use Builder pattern for ApkVerifier parameters.\"
am:
744e7746c4
Change-Id: I36d18044ea627ff9f5f83ef8463476de07ce45ff
Treehugger Robot [Thu, 23 Jun 2016 00:31:53 +0000 (00:31 +0000)]
Merge "Use Builder pattern for ApkVerifier parameters."
Alex Klyubin [Tue, 21 Jun 2016 17:46:56 +0000 (10:46 -0700)]
Use Builder pattern for ApkVerifier parameters.
This should make it easier to add parameters/options without breaking
existing clients.
Bug:
27461702
Change-Id: Ia4577f78d703a6b91828dd08492c78d5e9afb110
Dan Willemsen [Wed, 22 Jun 2016 20:44:42 +0000 (20:44 +0000)]
Merge \\"Finish refactoring tests to NATIVE_TESTS\\" am:
239f2b0f9f
am:
fed8d9e9f7
Change-Id: I66fd8b66a0acbc2fbb653bf2d90d3a68727d14e8
Dan Willemsen [Wed, 22 Jun 2016 20:41:57 +0000 (20:41 +0000)]
Merge \"Finish refactoring tests to NATIVE_TESTS\"
am:
239f2b0f9f
Change-Id: If34f994893a9ad00cadb3a6124ee21ccf36b142c
Treehugger Robot [Wed, 22 Jun 2016 20:37:40 +0000 (20:37 +0000)]
Merge "Finish refactoring tests to NATIVE_TESTS"
Dan Willemsen [Wed, 22 Jun 2016 07:27:54 +0000 (00:27 -0700)]
Finish refactoring tests to NATIVE_TESTS
Now that the source trees all use NATIVE_TESTS for intermediate files
and generated sources, make it a requirement.
Change-Id: Id5718fabe63f6e8dde7981a6f0f5bd89e0ec7ee5
Tianjie Xu [Wed, 22 Jun 2016 05:17:42 +0000 (05:17 +0000)]
Merge \"Limit the number of blocks in command zero\" into nyc-dev
am:
0eade3f027
Change-Id: I7f5cc1319863eb1ec1d87b6bf3e9cb62f3401e41
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: If484b9ee55f16b85cead3587d08c757ae8df6d2b
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
Guang Zhu [Wed, 22 Jun 2016 01:00:44 +0000 (01:00 +0000)]
Merge \\"move test artifact build rules into open source location\\" am:
59e060e1c6
am:
c8e8f38faa
Change-Id: I81bf4856cb2489e7983b0859df3dc36f2bee2e01
Guang Zhu [Wed, 22 Jun 2016 00:52:30 +0000 (00:52 +0000)]
Merge \"move test artifact build rules into open source location\"
am:
59e060e1c6
Change-Id: I5bb807dec5cffc0a60f28f54341c83f6c4224d10
Treehugger Robot [Wed, 22 Jun 2016 00:47:27 +0000 (00:47 +0000)]
Merge "move test artifact build rules into open source location"
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)
Guang Zhu [Tue, 21 Jun 2016 05:03:24 +0000 (22:03 -0700)]
move test artifact build rules into open source location
Bug:
29404304
Change-Id: I5553d275fe478fac0d6fe00a931a1c1f1e3bdd59
(cherry picked from commit
8322be725282d4ac64a65b44e2f6b0c681e35819)
Dan Willemsen [Tue, 21 Jun 2016 22:03:30 +0000 (22:03 +0000)]
Merge \\"Clean up vendor image handling\\" am:
4f807026e2
am:
edc6ed7aa0
Change-Id: Ia5dea45324ee41c84d997ca3e83401713e3a9ba9
Dan Willemsen [Tue, 21 Jun 2016 22:00:21 +0000 (22:00 +0000)]
Merge \"Clean up vendor image handling\"
am:
4f807026e2
Change-Id: I637ed099a6f127aa8abca980329ddc6ecad5e3ec
Dan Willemsen [Tue, 21 Jun 2016 21:54:40 +0000 (21:54 +0000)]
Merge "Clean up vendor image handling"
Guang Zhu [Tue, 21 Jun 2016 05:03:24 +0000 (22:03 -0700)]
move test artifact build rules into open source location
Bug:
29404304
Change-Id: I5553d275fe478fac0d6fe00a931a1c1f1e3bdd59
Elliott Hughes [Tue, 21 Jun 2016 00:08:23 +0000 (00:08 +0000)]
Merge \\"Remove --no_prereq flag from OTA script.\\" am:
bc450fc9c8
am:
bd30d5fa16
Change-Id: Ic083c9b038bd5a31f9b52ebd6fc498e0353239ca
Elliott Hughes [Tue, 21 Jun 2016 00:05:51 +0000 (00:05 +0000)]
Merge \"Remove --no_prereq flag from OTA script.\"
am:
bc450fc9c8
Change-Id: I35a4400afc829bf2b269135fa99f00979affd3bd
Elliott Hughes [Mon, 20 Jun 2016 23:57:56 +0000 (23:57 +0000)]
Merge "Remove --no_prereq flag from OTA script."
Elliott Hughes [Mon, 20 Jun 2016 21:35:47 +0000 (14:35 -0700)]
Remove --no_prereq flag from OTA script.
Bug: http://b/
29393071
Test: aosp_flounder "make dist"
Change-Id: I9ec85210e118f7e525291e31ab4081a2bd10f998
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
David Sehr [Mon, 20 Jun 2016 19:59:12 +0000 (19:59 +0000)]
Merge \\"Also turn down the logging for dex2oat on the boot image\\" am:
ee199c49d0
am:
c64a361d59
Change-Id: I4d0164fbbd74bd1e462999cebbfaaaf1e8383255
Joe Onorato [Mon, 20 Jun 2016 19:56:48 +0000 (19:56 +0000)]
Merge \"Also turn down the logging for dex2oat on the boot image\"
am:
ee199c49d0
Change-Id: Ib6118f42c5dce98df12e68732dfc9ceb3bec81c6
David Sehr [Mon, 20 Jun 2016 19:50:54 +0000 (19:50 +0000)]
Merge "Also turn down the logging for dex2oat on the boot image"
Joe Onorato [Thu, 17 Mar 2016 17:12:36 +0000 (10:12 -0700)]
Also turn down the logging for dex2oat on the boot image
Bug:
27499257
Change-Id: I190ce72b44e49451dab44902e2ca33dd5c2815ce
(cherry picked from commit
632db649fb16c0a8259c36dcf7534c8596273d89)
Dan Willemsen [Fri, 17 Jun 2016 21:07:37 +0000 (14:07 -0700)]
Clean up vendor image handling
Standardize symlinking /system/vendor -> /vendor for aosp_* devices,
since some /vendor binaries still use /system/vendor/... paths.
Support using a prebuilt vendor image and including it into all the
normal packaging steps.
Bug:
28987532
Change-Id: I27040e8a8d1df0777e16cd1e3c3a9f1b28695e96
Alex Klyubin [Fri, 17 Jun 2016 20:49:43 +0000 (20:49 +0000)]
Merge \\"Let caller handle NoSuchAlgorithmException.\\" am:
8427083a26
am:
a1daa9d537
Change-Id: I8d9677bdeb39d69fa1631a163229fa2b3a383d1d
Alex Klyubin [Fri, 17 Jun 2016 20:47:02 +0000 (20:47 +0000)]
Merge \"Let caller handle NoSuchAlgorithmException.\"
am:
8427083a26
Change-Id: I447c194f8f83cdec00760889f8c8f9278daf0ead
Alex Klyubin [Fri, 17 Jun 2016 20:36:00 +0000 (20:36 +0000)]
Merge "Let caller handle NoSuchAlgorithmException."
Alex Klyubin [Fri, 17 Jun 2016 19:24:41 +0000 (19:24 +0000)]
Merge \\"maxSdkVersion can be specified for APK verification.\\" am:
2ea2e205f4
am:
d3ffd9241c
Change-Id: If4dea9509b303386ccb8ae181cd98215055e9fee
Alex Klyubin [Fri, 17 Jun 2016 19:22:04 +0000 (19:22 +0000)]
Merge \"maxSdkVersion can be specified for APK verification.\"
am:
2ea2e205f4
Change-Id: I95cb3936c1b60a26ad4002fcb6dc551f58c0ccbd
Alex Klyubin [Thu, 16 Jun 2016 16:21:54 +0000 (09:21 -0700)]
Let caller handle NoSuchAlgorithmException.
This surfaces relevant NoSuchAlgorithmExceptions to the caller instead
of rethrowing as other exception types. Some setups need to be able to
distringuish issues due to their own misconfiguration
(required crypto algorithm mising -- NoSuchAlgorithmException) from
issues with the APK being signed or verified.
Bug:
27461702
Change-Id: I993f73edb29b2cd4cc485734a89a924ec357ef19
Alex Klyubin [Fri, 17 Jun 2016 19:10:42 +0000 (19:10 +0000)]
Merge "maxSdkVersion can be specified for APK verification."
Alex Klyubin [Fri, 17 Jun 2016 16:38:32 +0000 (09:38 -0700)]
maxSdkVersion can be specified for APK verification.
This enables verification of APKs which are served to a specific
range of Android platform versions, or to replicate behavior of
particular platform versions.
Bug:
27461702
Change-Id: I44ab4c99419eb97d72c4ccd109137fe1efda577d
Alex Klyubin [Fri, 17 Jun 2016 16:09:19 +0000 (16:09 +0000)]
Merge \\"Reject PKCS#7 SignerInfo with unsupported parameters.\\" am:
21213cff9c
am:
88297dac19
Change-Id: I189a0d980ec51e48237e19670bcd863fdfbd909a
Alex Klyubin [Fri, 17 Jun 2016 16:06:31 +0000 (16:06 +0000)]
Merge \"Reject PKCS#7 SignerInfo with unsupported parameters.\"
am:
21213cff9c
Change-Id: I9bec518914d7e2eff978dc7d189eb5641148f5ad
Alex Klyubin [Fri, 17 Jun 2016 15:56:51 +0000 (15:56 +0000)]
Merge "Reject PKCS#7 SignerInfo with unsupported parameters."
Elliott Hughes [Fri, 17 Jun 2016 05:02:05 +0000 (05:02 +0000)]
Merge \\"Remove obsolete MTD support from the releasetools scripts.\\" am:
63fc2b6766
am:
ece6ff869c
Change-Id: I4b5f5b6a622a2fbb996861e8832e1fc1d12e6bf4
Elliott Hughes [Fri, 17 Jun 2016 04:59:26 +0000 (04:59 +0000)]
Merge \"Remove obsolete MTD support from the releasetools scripts.\"
am:
63fc2b6766
Change-Id: I26ed21479ab52d535bcc99b13e55a1476a02f76c
Treehugger Robot [Fri, 17 Jun 2016 04:47:47 +0000 (04:47 +0000)]
Merge "Remove obsolete MTD support from the releasetools scripts."
Elliott Hughes [Thu, 16 Jun 2016 00:04:54 +0000 (17:04 -0700)]
Remove obsolete MTD support from the releasetools scripts.
Bug: http://b/
29250988
Change-Id: I653dc306485c6b35411840b53211d42eb6d19e34
Dan Willemsen [Thu, 16 Jun 2016 23:47:08 +0000 (23:47 +0000)]
Merge \\"Add new Android.mk to handle repo move\\" am:
ab95c4a59d
am:
821fb422cd
Change-Id: I5b1cbe0ea74171340cbfd46d8f8fe4cbf6d2578e
Dan Willemsen [Thu, 16 Jun 2016 23:44:17 +0000 (23:44 +0000)]
Merge \"Add new Android.mk to handle repo move\"
am:
ab95c4a59d
Change-Id: I435c234381c051846e78b2b1a7e305aa69918055
Treehugger Robot [Thu, 16 Jun 2016 23:25:45 +0000 (23:25 +0000)]
Merge "Add new Android.mk to handle repo move"
Dan Willemsen [Thu, 16 Jun 2016 23:00:41 +0000 (23:00 +0000)]
Merge \\"Remove build/libs\\" am:
fcb8a89c3b
am:
3c48705b9b
Change-Id: I208cf823efc29610c2978719eed5ca44a16c6454
Dan Willemsen [Thu, 16 Jun 2016 22:58:01 +0000 (22:58 +0000)]
Merge \"Remove build/libs\"
am:
fcb8a89c3b
Change-Id: Ib52f800fe84b7c3c8d060196713bd5677a9f791c
Treehugger Robot [Thu, 16 Jun 2016 22:49:35 +0000 (22:49 +0000)]
Merge "Remove build/libs"
Dan Willemsen [Thu, 16 Jun 2016 22:30:19 +0000 (15:30 -0700)]
Add new Android.mk to handle repo move
We're moving the platform/build repository down a level, then symlinking
the directories and necessary files back into build/. So if we're still
in build/, keep searching for Android.mk files, otherwise stop, since
they'll be found through the symlinks.
Bug:
28001743
Change-Id: Ieea6e3b1fca265b548395c6af148ebb4efa43b0f
Dan Willemsen [Thu, 16 Jun 2016 21:52:47 +0000 (14:52 -0700)]
Remove build/libs
There's only a single library, libhost, and it's only used by acp and
atree in build/tools, move it there.
Bug:
28001743
Change-Id: Ie404d2793710de4e265a6fa95d462c32d4042623
Vikas Marwaha [Thu, 16 Jun 2016 21:25:00 +0000 (21:25 +0000)]
Merge \"Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug:
26381401\" into nyc-dev
am:
44d50cac49 -s ours
Change-Id: Ie1d90bf2c7e69736a3aa9897adc88ec655ea83eb
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
Alex Klyubin [Wed, 15 Jun 2016 16:58:53 +0000 (09:58 -0700)]
Reject PKCS#7 SignerInfo with unsupported parameters.
This addresses the TODO to mimic the behavior of Android when
verifying APK JAR signatures. Unfortunately, the behavior of Android
kept changing in interesting ways between different platform versions.
This is hard-coded as a big lookup.
Bug:
27461702
Change-Id: I49bc181ee05f774ef8ee041af870385b35212c23
Mohamad Ayyash [Thu, 16 Jun 2016 16:39:39 +0000 (16:39 +0000)]
Merge \"squashfs: make disable-4k-align a parameter\" into nyc-dev
am:
8ebbc4e7e2
Change-Id: Ia5c59b7bfc7f2b25fa9b13c2ce52c1bd75ccecce
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 [Thu, 16 Jun 2016 15:53:20 +0000 (15:53 +0000)]
Merge \\"Support wiping userdata for A/B OTA packages.\\" am:
b727d5bb32
am:
4f2b227fae
Change-Id: Icf157b44ecda14a2c289d4826e5a55af67e805d5
Dan Willemsen [Thu, 16 Jun 2016 15:53:20 +0000 (15:53 +0000)]
Merge changes Ib6ffcc38,Ia58e6bc1 am:
3068a85962
am:
5da565a85a
Change-Id: Ib0c7157644c1d51f37b8c91c76adb35c2df00de6
Tao Bao [Thu, 16 Jun 2016 15:50:47 +0000 (15:50 +0000)]
Merge \"Support wiping userdata for A/B OTA packages.\"
am:
b727d5bb32
Change-Id: I9d6e67c5e71b025f7cb9119b45f05c51f2cfd340
Dan Willemsen [Thu, 16 Jun 2016 15:50:46 +0000 (15:50 +0000)]
Merge changes Ib6ffcc38,Ia58e6bc1
am:
3068a85962
Change-Id: I20aec66ac749a5db3f65e368e14a5caca12afff8
Treehugger Robot [Thu, 16 Jun 2016 15:39:23 +0000 (15:39 +0000)]
Merge "Support wiping userdata for A/B OTA packages."
Dan Willemsen [Thu, 16 Jun 2016 15:38:02 +0000 (15:38 +0000)]
Merge changes Ib6ffcc38,Ia58e6bc1
* changes:
Check that NDK-built modules only link to NDK-built modules
Add macros for printing pretty warnings/errors in rules
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
(cherry picked from commit
38ca0be399df26514f0412c7b7fca8050d36e9e2)
Dan Willemsen [Tue, 7 Jun 2016 21:25:14 +0000 (14:25 -0700)]
Check that NDK-built modules only link to NDK-built modules
Modules built against the NDK should only link against modules also
built against the NDK (or link to the NDK prebuilts). This patch
attempts to catch these cases, and prints a large warning when this is
violated. Once the tree is cleaned up, this will change to an error.
Change-Id: Ib6ffcc38d9161abdbe45a58af26ba429fb6f1876
Dan Willemsen [Thu, 16 Jun 2016 02:20:57 +0000 (19:20 -0700)]
Add macros for printing pretty warnings/errors in rules
Change-Id: Ia58e6bc1328c84e5f4ba1f6a2fd2d650e94e127e
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>
Dan Willemsen [Wed, 15 Jun 2016 22:57:48 +0000 (22:57 +0000)]
Merge \\"Fix kati --no_ignore_dirty usage\\" am:
a6f510c776
am:
cf771ed98f
Change-Id: I8d199811ed752acbf464016cdf23f5ca9d818a6d
Dan Willemsen [Wed, 15 Jun 2016 22:57:47 +0000 (22:57 +0000)]
Merge \\"Forbid libstdc++ on Linux and Darwin\\" am:
7fba3347b9
am:
3cd95c708d
Change-Id: I78315783b64ce9a1a796795af6f7818604367cf9
Dan Willemsen [Wed, 15 Jun 2016 22:55:02 +0000 (22:55 +0000)]
Merge \"Fix kati --no_ignore_dirty usage\"
am:
a6f510c776
Change-Id: I3b33f8a4762c7f8867afb5812933c452cdfa16b2
Dan Willemsen [Wed, 15 Jun 2016 22:54:59 +0000 (22:54 +0000)]
Merge \"Forbid libstdc++ on Linux and Darwin\"
am:
7fba3347b9
Change-Id: I896febb45ca1245fa56dff113463606ac88b7c01
Treehugger Robot [Wed, 15 Jun 2016 22:41:32 +0000 (22:41 +0000)]
Merge "Fix kati --no_ignore_dirty usage"
Dan Willemsen [Wed, 15 Jun 2016 22:38:30 +0000 (22:38 +0000)]
Merge "Forbid libstdc++ on Linux and Darwin"
Dan Willemsen [Wed, 15 Jun 2016 21:55:58 +0000 (14:55 -0700)]
Fix kati --no_ignore_dirty usage
Kati only supports a single use of --no_ignore_dirty, so we were
ignoring the SOONG_ANDROID_MK file, and only detecting changes to
SOONG_MAKEVARS_MK. Fix this by using a pattern that should apply to both
of those makefiles.
Change-Id: I46390f9887f95f1db0efe4e93339667f35ebc67c
OSDN Git Service
