Commit Graph

29778 Commits

Author SHA1 Message Date
Elliott Hughes
38f9a845ca Merge \\"Remove --no_prereq flag from OTA script.\\" am: bc450fc9c8
am: bd30d5fa16

Change-Id: Ic083c9b038bd5a31f9b52ebd6fc498e0353239ca
2016-06-21 00:08:23 +00:00
Elliott Hughes
bd30d5fa16 Merge \"Remove --no_prereq flag from OTA script.\"
am: bc450fc9c8

Change-Id: I35a4400afc829bf2b269135fa99f00979affd3bd
2016-06-21 00:05:51 +00:00
Elliott Hughes
bc450fc9c8 Merge "Remove --no_prereq flag from OTA script." 2016-06-20 23:57:56 +00:00
Elliott Hughes
d8a52f9785 Remove --no_prereq flag from OTA script.
Bug: http://b/29393071
Test: aosp_flounder "make dist"
Change-Id: I9ec85210e118f7e525291e31ab4081a2bd10f998
2016-06-20 14:44:18 -07:00
David Sehr
e79e98a6e7 Merge \\"Also turn down the logging for dex2oat on the boot image\\" am: ee199c49d0
am: c64a361d59

Change-Id: I4d0164fbbd74bd1e462999cebbfaaaf1e8383255
2016-06-20 19:59:12 +00:00
Joe Onorato
c64a361d59 Merge \"Also turn down the logging for dex2oat on the boot image\"
am: ee199c49d0

Change-Id: Ib6118f42c5dce98df12e68732dfc9ceb3bec81c6
2016-06-20 19:56:48 +00:00
David Sehr
ee199c49d0 Merge "Also turn down the logging for dex2oat on the boot image" 2016-06-20 19:50:54 +00:00
Joe Onorato
b7fd3d212b Also turn down the logging for dex2oat on the boot image
Bug: 27499257
Change-Id: I190ce72b44e49451dab44902e2ca33dd5c2815ce
(cherry picked from commit 632db649fb)
2016-06-20 11:15:31 -07:00
Alex Klyubin
7f58c5d8f0 Merge \\"Let caller handle NoSuchAlgorithmException.\\" am: 8427083a26
am: a1daa9d537

Change-Id: I8d9677bdeb39d69fa1631a163229fa2b3a383d1d
2016-06-17 20:49:43 +00:00
Alex Klyubin
a1daa9d537 Merge \"Let caller handle NoSuchAlgorithmException.\"
am: 8427083a26

Change-Id: I447c194f8f83cdec00760889f8c8f9278daf0ead
2016-06-17 20:47:02 +00:00
Alex Klyubin
8427083a26 Merge "Let caller handle NoSuchAlgorithmException." 2016-06-17 20:36:00 +00:00
Alex Klyubin
cbb41d2717 Merge \\"maxSdkVersion can be specified for APK verification.\\" am: 2ea2e205f4
am: d3ffd9241c

Change-Id: If4dea9509b303386ccb8ae181cd98215055e9fee
2016-06-17 19:24:41 +00:00
Alex Klyubin
d3ffd9241c Merge \"maxSdkVersion can be specified for APK verification.\"
am: 2ea2e205f4

Change-Id: I95cb3936c1b60a26ad4002fcb6dc551f58c0ccbd
2016-06-17 19:22:04 +00:00
Alex Klyubin
05f87de7a3 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
2016-06-17 12:15:32 -07:00
Alex Klyubin
2ea2e205f4 Merge "maxSdkVersion can be specified for APK verification." 2016-06-17 19:10:42 +00:00
Alex Klyubin
f31ced2e10 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
2016-06-17 10:02:47 -07:00
Alex Klyubin
23bd7d68f8 Merge \\"Reject PKCS#7 SignerInfo with unsupported parameters.\\" am: 21213cff9c
am: 88297dac19

Change-Id: I189a0d980ec51e48237e19670bcd863fdfbd909a
2016-06-17 16:09:19 +00:00
Alex Klyubin
88297dac19 Merge \"Reject PKCS#7 SignerInfo with unsupported parameters.\"
am: 21213cff9c

Change-Id: I9bec518914d7e2eff978dc7d189eb5641148f5ad
2016-06-17 16:06:31 +00:00
Alex Klyubin
21213cff9c Merge "Reject PKCS#7 SignerInfo with unsupported parameters." 2016-06-17 15:56:51 +00:00
Elliott Hughes
f66d3e61f8 Merge \\"Remove obsolete MTD support from the releasetools scripts.\\" am: 63fc2b6766
am: ece6ff869c

Change-Id: I4b5f5b6a622a2fbb996861e8832e1fc1d12e6bf4
2016-06-17 05:02:05 +00:00
Elliott Hughes
ece6ff869c Merge \"Remove obsolete MTD support from the releasetools scripts.\"
am: 63fc2b6766

Change-Id: I26ed21479ab52d535bcc99b13e55a1476a02f76c
2016-06-17 04:59:26 +00:00
Treehugger Robot
63fc2b6766 Merge "Remove obsolete MTD support from the releasetools scripts." 2016-06-17 04:47:47 +00:00
Elliott Hughes
305b088729 Remove obsolete MTD support from the releasetools scripts.
Bug: http://b/29250988
Change-Id: I653dc306485c6b35411840b53211d42eb6d19e34
2016-06-16 20:48:47 -07:00
Dan Willemsen
ae4e49e500 Merge \\"Add new Android.mk to handle repo move\\" am: ab95c4a59d
am: 821fb422cd

Change-Id: I5b1cbe0ea74171340cbfd46d8f8fe4cbf6d2578e
2016-06-16 23:47:08 +00:00
Dan Willemsen
821fb422cd Merge \"Add new Android.mk to handle repo move\"
am: ab95c4a59d

Change-Id: I435c234381c051846e78b2b1a7e305aa69918055
2016-06-16 23:44:17 +00:00
Treehugger Robot
ab95c4a59d Merge "Add new Android.mk to handle repo move" 2016-06-16 23:25:46 +00:00
Dan Willemsen
947c5715f8 Merge \\"Remove build/libs\\" am: fcb8a89c3b
am: 3c48705b9b

Change-Id: I208cf823efc29610c2978719eed5ca44a16c6454
2016-06-16 23:00:41 +00:00
Dan Willemsen
3c48705b9b Merge \"Remove build/libs\"
am: fcb8a89c3b

Change-Id: Ib52f800fe84b7c3c8d060196713bd5677a9f791c
2016-06-16 22:58:01 +00:00
Treehugger Robot
fcb8a89c3b Merge "Remove build/libs" 2016-06-16 22:49:35 +00:00
Dan Willemsen
c72dfe3cca 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
2016-06-16 15:30:19 -07:00
Dan Willemsen
eb4431595c 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
2016-06-16 14:52:47 -07:00
Vikas Marwaha
47eaaf94bc Merge \"Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug: 26381401\" into nyc-dev
am: 44d50cac49  -s ours

Change-Id: Ie1d90bf2c7e69736a3aa9897adc88ec655ea83eb
2016-06-16 21:25:00 +00:00
Vikas Marwaha
44d50cac49 Merge "Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug: 26381401" into nyc-dev 2016-06-16 20:47:30 +00:00
Alex Klyubin
d7236da153 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
2016-06-16 12:44:36 -07:00
Mohamad Ayyash
3336f9ae67 Merge \"squashfs: make disable-4k-align a parameter\" into nyc-dev
am: 8ebbc4e7e2

Change-Id: Ia5c59b7bfc7f2b25fa9b13c2ce52c1bd75ccecce
2016-06-16 16:39:39 +00:00
Mohamad Ayyash
8ebbc4e7e2 Merge "squashfs: make disable-4k-align a parameter" into nyc-dev 2016-06-16 16:24:34 +00:00
Tao Bao
7e5205f929 Merge \\"Support wiping userdata for A/B OTA packages.\\" am: b727d5bb32
am: 4f2b227fae

Change-Id: Icf157b44ecda14a2c289d4826e5a55af67e805d5
2016-06-16 15:53:20 +00:00
Dan Willemsen
c4c3cc2ee9 Merge changes Ib6ffcc38,Ia58e6bc1 am: 3068a85962
am: 5da565a85a

Change-Id: Ib0c7157644c1d51f37b8c91c76adb35c2df00de6
2016-06-16 15:53:20 +00:00
Tao Bao
4f2b227fae Merge \"Support wiping userdata for A/B OTA packages.\"
am: b727d5bb32

Change-Id: I9d6e67c5e71b025f7cb9119b45f05c51f2cfd340
2016-06-16 15:50:47 +00:00
Dan Willemsen
5da565a85a Merge changes Ib6ffcc38,Ia58e6bc1
am: 3068a85962

Change-Id: I20aec66ac749a5db3f65e368e14a5caca12afff8
2016-06-16 15:50:46 +00:00
Treehugger Robot
b727d5bb32 Merge "Support wiping userdata for A/B OTA packages." 2016-06-16 15:39:23 +00:00
Dan Willemsen
3068a85962 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
2016-06-16 15:38:02 +00:00
Tao Bao
7c5dc578b3 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 38ca0be399)
2016-06-15 23:19:52 -07:00
Dan Willemsen
b097fbed0a 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
2016-06-15 20:22:19 -07:00
Dan Willemsen
dd5a5d328b Add macros for printing pretty warnings/errors in rules
Change-Id: Ia58e6bc1328c84e5f4ba1f6a2fd2d650e94e127e
2016-06-15 20:22:19 -07:00
Mohamad Ayyash
1b6d3485fc squashfs: make disable-4k-align a parameter
BUG: 29388879
Change-Id: I121d2b76db5fb269e2f7152abb2e78098437a0d5
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-06-15 16:37:21 -07:00
Dan Willemsen
018d5d174a Merge \\"Fix kati --no_ignore_dirty usage\\" am: a6f510c776
am: cf771ed98f

Change-Id: I8d199811ed752acbf464016cdf23f5ca9d818a6d
2016-06-15 22:57:48 +00:00
Dan Willemsen
bf4617c424 Merge \\"Forbid libstdc++ on Linux and Darwin\\" am: 7fba3347b9
am: 3cd95c708d

Change-Id: I78315783b64ce9a1a796795af6f7818604367cf9
2016-06-15 22:57:47 +00:00
Dan Willemsen
cf771ed98f Merge \"Fix kati --no_ignore_dirty usage\"
am: a6f510c776

Change-Id: I3b33f8a4762c7f8867afb5812933c452cdfa16b2
2016-06-15 22:55:02 +00:00
Dan Willemsen
3cd95c708d Merge \"Forbid libstdc++ on Linux and Darwin\"
am: 7fba3347b9

Change-Id: I896febb45ca1245fa56dff113463606ac88b7c01
2016-06-15 22:54:59 +00:00