OSDN Git Service
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
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
Alex Klyubin [Wed, 15 Jun 2016 20:48:11 +0000 (20:48 +0000)]
Merge \\"Don\\'t depend on Bouncy Castle.\\" am:
1fb96c3ff5
am:
3b36c7960d
Change-Id: Ib33cb3a8aaa94df96731a16f20a7ef5415f42a3f
Alex Klyubin [Wed, 15 Jun 2016 20:43:46 +0000 (20:43 +0000)]
Merge \"Don\'t depend on Bouncy Castle.\"
am:
1fb96c3ff5
Change-Id: I04401121eb3ad2e026268f37ffe9d19d95478325
Dan Willemsen [Wed, 15 Jun 2016 20:41:45 +0000 (13:41 -0700)]
Forbid libstdc++ on Linux and Darwin
The last user has been removed, forbid any modules from selecting this.
Change-Id: Idd9ef6ca4b6c6754935d59c4a09c7d213ae481c1
Alex Klyubin [Wed, 15 Jun 2016 20:32:34 +0000 (20:32 +0000)]
Merge "Don't depend on Bouncy Castle."
Mohamad Ayyash [Wed, 15 Jun 2016 16:12:55 +0000 (16:12 +0000)]
Merge \"Pass block_list param to mksquashfs\" into nyc-dev
am:
3bddf74752
Change-Id: I1679c255b297a36bc10b50ff9d6214c92d763489
Tao Bao [Wed, 15 Jun 2016 16:12:52 +0000 (16:12 +0000)]
Merge \"releasetools: Disable using imgdiff for squashfs.\" into nyc-dev
am:
a8d3741f1a
Change-Id: If8392b72a865f53449a1d5ca7b52de7697c4b412
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
Alex Klyubin [Tue, 14 Jun 2016 22:43:35 +0000 (22:43 +0000)]
Merge \\"Faster and cleaner way to obtain UTF-8 encoded form.\\" am:
98b4f07dfc
am:
5e8b2c9207
Change-Id: I48bc0772fcb1acf050d04f650c1b0eca8a6c79cb
Alex Klyubin [Tue, 14 Jun 2016 22:41:02 +0000 (22:41 +0000)]
Merge \"Faster and cleaner way to obtain UTF-8 encoded form.\"
am:
98b4f07dfc
Change-Id: Ic5e071d01ea0fd9a091097e3659f16c0b71f5ae6
Treehugger Robot [Tue, 14 Jun 2016 22:37:10 +0000 (22:37 +0000)]
Merge "Faster and cleaner way to obtain UTF-8 encoded form."
Dan Willemsen [Tue, 14 Jun 2016 22:33:19 +0000 (22:33 +0000)]
Merge \\"Use more prebuilt build-tools\\" am:
6c0c720389
am:
ffb643e487
Change-Id: I4cdec816470a05193c4c303f3c6343815f2b671c
Dan Willemsen [Tue, 14 Jun 2016 22:28:02 +0000 (22:28 +0000)]
Merge \"Use more prebuilt build-tools\"
am:
6c0c720389
Change-Id: Icb67388bf084f2de872e9df8747b70cbde42b5f9
Treehugger Robot [Tue, 14 Jun 2016 22:14:06 +0000 (22:14 +0000)]
Merge "Use more prebuilt build-tools"
Alex Klyubin [Tue, 14 Jun 2016 21:18:21 +0000 (14:18 -0700)]
Faster and cleaner way to obtain UTF-8 encoded form.
Instead of specifying character encoding by name, the faster, cleaner,
and safer way is to use StandardCharsets.UTF_8.
Bug:
27461702
Change-Id: I897284d3ceeb44a21cc74de09a9b25f6aec8c205
Alex Klyubin [Tue, 14 Jun 2016 21:05:45 +0000 (21:05 +0000)]
Merge \\"APK JAR signature verifier.\\" am:
cf89865b95
am:
d1af20e103
Change-Id: I7cae6cda81bebf10b7abf3175d428452620e83bf
Alex Klyubin [Tue, 14 Jun 2016 21:03:04 +0000 (21:03 +0000)]
Merge \"APK JAR signature verifier.\"
am:
cf89865b95
Change-Id: If54865fdf6d290ab38a3f6a0f3eec2142c55e8d0
Alex Klyubin [Tue, 14 Jun 2016 20:56:27 +0000 (20:56 +0000)]
Merge "APK JAR signature verifier."
Dan Willemsen [Mon, 6 Jun 2016 21:44:00 +0000 (14:44 -0700)]
Use more prebuilt build-tools
For acp, we've been using an old prebuilt in prebuilts/sdk, but it's not
part of the SDK. Instead, we'll use a prebuilt in the build-tools
repository.
For ijar, we've been using the host libstdc++ to workaround the lack of
libc++ on some unbundled branches. Instead, use a prebuilt that can use
libc++.
For ziptime, we've been disabling it on unbundled branches, due to the
lack of libc++. Instead, use a prebuilt version of ziptime that can use
the prebuilt libc++.
Change-Id: If80f845ea06f76e3fe6765964e77c864eaf303d0
Dan Willemsen [Tue, 14 Jun 2016 20:28:24 +0000 (20:28 +0000)]
Merge \\"Add a libc++ version of ijar for prebuilt use\\" am:
06f3e8349f
am:
38ff3ae039
Change-Id: I83c7313db392a137b0d54232d4f122b54120ce2a
Jeff Hao [Tue, 14 Jun 2016 20:28:22 +0000 (20:28 +0000)]
Merge \\"Skip uses-library check for preopted apps.\\" am:
7b4c07f1d5
am:
baf8869991
Change-Id: Id14f3aca9e19d900deb31ce35292810f9d35fafe
Dan Willemsen [Tue, 14 Jun 2016 20:04:21 +0000 (20:04 +0000)]
Merge \"Add a libc++ version of ijar for prebuilt use\"
am:
06f3e8349f
Change-Id: I284c7c85de71551e608e4210ab71b17e36229e09
Jeff Hao [Tue, 14 Jun 2016 20:04:20 +0000 (20:04 +0000)]
Merge \"Skip uses-library check for preopted apps.\"
am:
7b4c07f1d5
Change-Id: I6e027842b3eb70b333efd20ccf6798e88baef436
Treehugger Robot [Tue, 14 Jun 2016 18:34:38 +0000 (18:34 +0000)]
Merge "Add a libc++ version of ijar for prebuilt use"
Alex Klyubin [Tue, 14 Jun 2016 17:26:41 +0000 (10:26 -0700)]
Don't depend on Bouncy Castle.
This switches PKCS#7 SignedData generation code from Bouncy Castle to
OpenJDK's proprietary internal API. This is to avoid depending on a
huge library that's not really needed. In the longer term, it's best
to add our own implementation of PKCS#7 SignedData building, parsing,
and verification. This will give the code more power to mimic what the
Android platform does.
Bug:
27461702
Change-Id: I29f1ceea1293e35424fde69c0f2969d551345100
Dan Willemsen [Tue, 14 Jun 2016 17:30:06 +0000 (10:30 -0700)]
Add a libc++ version of ijar for prebuilt use
I'll remove the old version once we've moved over to the prebuilts.
Change-Id: Ifd8d396f8b653abbe958cd34e69831a6ca378649
Alex Klyubin [Wed, 8 Jun 2016 21:54:28 +0000 (14:54 -0700)]
APK JAR signature verifier.
This adds JAR signature verification to ApkVerifier.
Bug:
27461702
Change-Id: Id2b72bea7869be66268f6bc1387e1559ee02ff9d
Treehugger Robot [Tue, 14 Jun 2016 17:22:25 +0000 (17:22 +0000)]
Merge "Skip uses-library check for preopted apps."
Jeff Hao [Tue, 14 Jun 2016 02:15:53 +0000 (02:15 +0000)]
Skip uses-library check for preopted apps.
am:
b00263f96a
Change-Id: Icc9170bc494750eac12f141e7afd09d36564a2cc
Yabin Cui [Tue, 14 Jun 2016 01:24:05 +0000 (01:24 +0000)]
Merge \\"Add option to link static lite protobuf library.\\" am:
e6fae50455
am:
bebdc16a68
Change-Id: I60b9fb9437fe15079c62c3d47401341b54ebc7bc
Jeff Hao [Mon, 13 Jun 2016 23:53:11 +0000 (16:53 -0700)]
Skip uses-library check for preopted apps.
Bug:
26880306
(cherry-picked from commit
b00263f96a90c9f77cf7d8d90742a0884290bf60)
Change-Id: I22beccaf61ca30cf1487a25f80e1c3fd7bdf2c62
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
Yabin Cui [Tue, 14 Jun 2016 00:25:05 +0000 (00:25 +0000)]
Merge \"Add option to link static lite protobuf library.\"
am:
e6fae50455
Change-Id: Idcc3c54033724a9cef17a219b4c118689eaad297
Yabin Cui [Tue, 14 Jun 2016 00:16:34 +0000 (00:16 +0000)]
Merge "Add option to link static lite protobuf library."
Alex Klyubin [Mon, 13 Jun 2016 20:06:33 +0000 (20:06 +0000)]
Merge \\"More general OutputStreamDataSink.\\" am:
dca955a9bd
am:
58c8559979
Change-Id: I1caf9f4ae2650dfadcb003315c12a30a3288fd4f
Alex Klyubin [Mon, 13 Jun 2016 20:02:12 +0000 (20:02 +0000)]
Merge \"More general OutputStreamDataSink.\"
am:
dca955a9bd
Change-Id: Id94e07f6007c3288c0501d6cd9017680108e4dbf
Alex Klyubin [Mon, 13 Jun 2016 19:49:01 +0000 (19:49 +0000)]
Merge "More general OutputStreamDataSink."
Alex Klyubin [Mon, 13 Jun 2016 18:26:05 +0000 (18:26 +0000)]
Merge \\"Fix inefficiency in APK entry data alignment.\\" am:
a85e0aa883
am:
7fe6ba2197
Change-Id: I97934b2a4cdfabb463f5012149ef28a15768c321
Alex Klyubin [Mon, 13 Jun 2016 18:22:19 +0000 (18:22 +0000)]
Merge \"Fix inefficiency in APK entry data alignment.\"
am:
a85e0aa883
Change-Id: I8c1b8116ab66c83e9b73f103adaf6237e51a6c1f
Alex Klyubin [Mon, 13 Jun 2016 18:14:18 +0000 (18:14 +0000)]
Merge "Fix inefficiency in APK entry data alignment."
Alex Klyubin [Mon, 13 Jun 2016 17:19:26 +0000 (10:19 -0700)]
More general OutputStreamDataSink.
This replaces the less general DataSink which outputs into a
ByteArrayOutputStream with a more general DataSink which outputs into
an OutputStream.
Bug:
27461702
Change-Id: I9467f38c41f586b71f35edb3602fd6e57153184f
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