Commit Graph

4255 Commits

Author SHA1 Message Date
Sami Tolvanen
ba788ce6e6 Merge "build_image: don\'t call append2simg for FEC"
am: e2476f82a1

* commit 'e2476f82a1c83c5efda8d8e29d25305439e91985':
  build_image: don't call append2simg for FEC
2015-12-21 11:30:44 +00:00
Sami Tolvanen
c734083df3 Merge "build_image: remove an unnecessary call to append2simg"
am: 06b4ff6696

* commit '06b4ff6696dfc11fafde52e17c6e9d46f0ec1be5':
  build_image: remove an unnecessary call to append2simg
2015-12-21 11:30:35 +00:00
Sami Tolvanen
e2476f82a1 Merge "build_image: don't call append2simg for FEC" 2015-12-21 11:21:16 +00:00
Sami Tolvanen
06b4ff6696 Merge "build_image: remove an unnecessary call to append2simg" 2015-12-21 11:19:26 +00:00
Daniel Rosenberg
d80bef2b9e Allow building recovery as boot.
With BOARD_USES_RECOVERY_AS_BOOT = true, we skip building the
non-ramdisk boot.img but building the recovery image as boot.img. It
contains recovery's ramdisk (e.g. with /sbin/recovery). It depends on
the bootloader parameter (skip_initramfs) to determine the actual mode
to boot into.

Change-Id: Id6e2d0a2b94383944ca8f35bba688c6401745622
2015-12-18 17:16:32 -08:00
Alex Klyubin
5f7f8b9d34 Merge "Move signapk sources to src dir." am: 421d84f911
am: fe20ca0229

* commit 'fe20ca0229ba508647d579bde969b7c5ad95b13d':
  Move signapk sources to src dir.
2015-12-18 21:47:36 +00:00
Alex Klyubin
fe20ca0229 Merge "Move signapk sources to src dir."
am: 421d84f911

* commit '421d84f911218387dc638dd7ef897aa3199b96b6':
  Move signapk sources to src dir.
2015-12-18 13:45:16 -08:00
Tianjie Xu
fc3422ad36 Check block0 for remounting partition R/W
Add a function check_first_block to read block0 and output a message
on screen if the device has been remounted. The function is called
for version >= 4 only; it executes after a failing block verification
and before recovery attempts.

Bug: 21124327
Change-Id: I49dc0b861c702698896a2495ca094215705d4650
(cherry picked from commit 9dac797013)
2015-12-18 11:05:34 -08:00
Alex Klyubin
421d84f911 Merge "Move signapk sources to src dir." 2015-12-18 18:06:37 +00:00
Sami Tolvanen
4a0600406e build_image: don't call append2simg for FEC
append2simg can be slow, so generate error correction data before verity
data is appended, and append all metadata to the image at the same time.

Needs matching changes from
  I09349368925e5e2f2a7961a712a1e933eb0b9ec8

Bug: 26251929
Change-Id: Iea8cee0aee353b4d029d9581e8fbd68ec7b7dd4b
2015-12-18 15:50:25 +00:00
Sami Tolvanen
ff914f5dd0 build_image: remove an unnecessary call to append2simg
append2simg on a large image is fairly slow, so append verity metadata to
the hash tree to avoid two calls.

Bug: 26251929
Change-Id: I5ec84dcd6e8500e990af13b1f9cef5e809b41605
2015-12-18 13:28:25 +00:00
Tianjie Xu
9dac797013 Check block0 for remounting partition R/W
Add a function check_first_block to read block0 and output a message
on screen if the device has been remounted. The function is called
for version >= 4 only; it executes after a failing block verification
and before recovery attempts.

Bug: 21124327
Change-Id: I49dc0b861c702698896a2495ca094215705d4650
2015-12-17 14:16:02 -08:00
Todd Poynor
5bf7fdaac2 Merge "Make squashfs sparse image generation optional" am: ffce16c7e6
am: 77d1b2ec31

* commit '77d1b2ec314dee2a381d3f0164a940dedb883281':
  Make squashfs sparse image generation optional
2015-12-16 23:44:33 +00:00
Todd Poynor
77d1b2ec31 Merge "Make squashfs sparse image generation optional"
am: ffce16c7e6

* commit 'ffce16c7e6bdabb909a36c2b97b7881eddd5ba54':
  Make squashfs sparse image generation optional
2015-12-16 22:32:31 +00:00
Todd Poynor
ffce16c7e6 Merge "Make squashfs sparse image generation optional" 2015-12-16 22:12:53 +00:00
Gina Dimino
7ae8e1ea91 Merge "Docs: Replace custom search engine Bug: 25778395" am: 36412fa8f9
am: 2635974ed8

* commit '2635974ed8574eac98266365287e0fd8c7cf6f2e':
  Docs: Replace custom search engine Bug: 25778395
2015-12-16 19:38:57 +00:00
Gina Dimino
2635974ed8 Merge "Docs: Replace custom search engine Bug: 25778395"
am: 36412fa8f9

* commit '36412fa8f9cc59c3aa31988d8a38576aeae6b6bd':
  Docs: Replace custom search engine Bug: 25778395
2015-12-16 19:01:13 +00:00
Gina Dimino
8cc3a9e117 Docs: Replace custom search engine
Bug: 25778395

Change-Id: I432698f63088a3e4ec285e46c7de2295c4cefad3
2015-12-16 10:00:33 -08:00
Todd Poynor
b2a555e6fc Make squashfs sparse image generation optional
Allow non-sparse squashfs image generation, a la ext filesystems.

Bug: 26218766
Change-Id: Ifd596af16411e0cf69a2e7e05d725fd9442dc79c
2015-12-15 20:11:12 -08:00
Colin Cross
70fd02af56 Merge "Remove unneccessary TARGET_BUILD_APPS conditional" am: e416a5f716
am: 1452e0a389

* commit '1452e0a389a24a6515bc8915076a93155f7bbced':
  Remove unneccessary TARGET_BUILD_APPS conditional
2015-12-16 02:01:19 +00:00
Colin Cross
1452e0a389 Merge "Remove unneccessary TARGET_BUILD_APPS conditional"
am: e416a5f716

* commit 'e416a5f71638bc324a368e4c66a4834117322c7a':
  Remove unneccessary TARGET_BUILD_APPS conditional
2015-12-16 01:33:33 +00:00
Colin Cross
493205eee4 Remove unneccessary TARGET_BUILD_APPS conditional
The prebuilt tools no longer conflict with the tools built from source,
remove the conditional.

Change-Id: Id334e25d9cfa2d5934450dd223bc9e30cd890062
2015-12-15 15:49:53 -08:00
Alex Klyubin
fe7c1e59d1 Move signapk sources to src dir.
This also makes source files follow the standard directory structure
based on Java package names.

Bug: 25794543
Change-Id: Ie0b568057f836e56407f76d29eeacd28ab907ba8
2015-12-15 09:08:45 -08:00
Alex Klyubin
c1b31821ef Merge "Make signapk use Conscrypt." am: 7884a63731
am: dfd2199ef6

* commit 'dfd2199ef66dcc162a0165f9a34652ae2877538d':
  Make signapk use Conscrypt.
2015-12-11 10:47:26 -08:00
Alex Klyubin
dfd2199ef6 Merge "Make signapk use Conscrypt."
am: 7884a63731

* commit '7884a63731a876f483c13288c87d8e7af7a533e4':
  Make signapk use Conscrypt.
2015-12-11 10:37:16 -08:00
Alex Klyubin
9667b18f23 Make signapk use Conscrypt.
This makes the signapk tool use Conscrypt (where possible) instead of
the platform-default JCA providers and the Bouncy Castle JCA provider.
This speeds up (by 10-30%) APK and OTA update signing because
Conscrypt's crypto primitives are backed by BoringSSL.

Previously, the signapk tool consisted only of the signapk.jar.
Because Conscrypt is backed by native code, signapk now consists of
signapk.jar and crypto_openjdk_jni shared library. This requires that
users of the tool be updated to provide a suitable -Djava.library.path
argument to the Java runtime. This change updates all known users of
the tool inside the Android source tree to do so.

Bug: 26097626
Change-Id: I8411b37d7f771ed99269751a3007dff103083552
2015-12-11 08:36:42 -08:00
Dirk Dougherty
0dc81b905f Update templates-sdk-dev to current templates-sdk.
Change-Id: I8c3da5a59d128ab5631c86737e3ede9c7f9b8deb
2015-12-08 14:49:52 -08:00
Alex Klyubin
68011a6ad0 Merge "Do not run zipalign when re-signing APKs." am: 31066abfde
am: 95ba90d1f0

* commit '95ba90d1f0ded087683f9283b5c3538dd4f349d7':
  Do not run zipalign when re-signing APKs.
2015-12-08 20:26:50 +00:00
Alex Klyubin
95ba90d1f0 Merge "Do not run zipalign when re-signing APKs."
am: 31066abfde

* commit '31066abfde08abdefe00be67074a2c7401917f97':
  Do not run zipalign when re-signing APKs.
2015-12-08 20:23:37 +00:00
Alex Klyubin
eb756d7b7b Do not run zipalign when re-signing APKs.
Running zipalign is no longer needed because signapk takes care of
alignment.

Bug: 25794543
Change-Id: I1080240a67ea6f1b41585fff83d18d57fdcf44e2
2015-12-08 11:05:13 -08:00
Alex Klyubin
88a8b4f6ac Merge "Make signapk align .so entries to 4096 bytes." am: dbb5527a9e am: 7f1eda800d
am: 3ad587e9ff

* commit '3ad587e9ff6b90b80b30b82d0bc51cc40b95c85a':
  Make signapk align .so entries to 4096 bytes.
2015-12-04 17:16:49 +00:00
Alex Klyubin
3ad587e9ff Merge "Make signapk align .so entries to 4096 bytes." am: dbb5527a9e
am: 7f1eda800d

* commit '7f1eda800d8cdb793b521e20798eaacb3fe410ad':
  Make signapk align .so entries to 4096 bytes.
2015-12-04 17:13:36 +00:00
Alex Klyubin
7f1eda800d Merge "Make signapk align .so entries to 4096 bytes."
am: dbb5527a9e

* commit 'dbb5527a9ef27f292794d1e51ae56d1df68c328b':
  Make signapk align .so entries to 4096 bytes.
2015-12-04 17:10:01 +00:00
Alex Klyubin
dbb5527a9e Merge "Make signapk align .so entries to 4096 bytes." 2015-12-04 17:05:27 +00:00
Neil Fuller
595ad9ae5b Merge "Remove synchronized from the public API docs" 2015-12-04 11:09:54 +00:00
Shinichiro Hamaji
fb4b3d25f9 Merge "Remove warnings from ijar/classfile.cc" am: 128053b91b am: 8707422e4e
am: ba1277549d

* commit 'ba1277549d322091ecbfc6b3738c9590f65ef823':
  Remove warnings from ijar/classfile.cc
2015-12-03 17:29:50 +00:00
Shinichiro Hamaji
ba1277549d Merge "Remove warnings from ijar/classfile.cc" am: 128053b91b
am: 8707422e4e

* commit '8707422e4ee24ca96befbf2bf54deca2590bedfa':
  Remove warnings from ijar/classfile.cc
2015-12-03 05:45:48 +00:00
Shinichiro Hamaji
8707422e4e Merge "Remove warnings from ijar/classfile.cc"
am: 128053b91b

* commit '128053b91b959d0664c33659063c5246eb57a594':
  Remove warnings from ijar/classfile.cc
2015-12-03 05:42:52 +00:00
Shinichiro Hamaji
128053b91b Merge "Remove warnings from ijar/classfile.cc" 2015-12-03 05:39:24 +00:00
Alex Klyubin
924a683760 Make signapk align .so entries to 4096 bytes.
This makes signapk align uncompressed .so entries to memory page
boundary (4096 bytes) to enable such libraries to be loaded at runtime
through memory-mapping the APK.

With this change in place, there should no longer be a need to run
zipalign after (or before) signapk.

Bug: 25794543
Change-Id: I74775af15a683791f57fcbd3497a79951b3f63a1
2015-12-02 19:02:01 -08:00
Tao Bao
870f97298d Merge "releasetools: Always use recovery mount options." am: 643d466f7b am: 1709cf3768
am: 50aa7c731b

* commit '50aa7c731b338d32d676326589652f21249dc2c9':
  releasetools: Always use recovery mount options.
2015-12-03 01:38:34 +00:00
Tao Bao
50aa7c731b Merge "releasetools: Always use recovery mount options." am: 643d466f7b
am: 1709cf3768

* commit '1709cf3768b54c1abc267b5ee92f57023e206c26':
  releasetools: Always use recovery mount options.
2015-12-03 01:35:04 +00:00
Tao Bao
1709cf3768 Merge "releasetools: Always use recovery mount options."
am: 643d466f7b

* commit '643d466f7b853ab4009723e2da200e3a6642d2ad':
  releasetools: Always use recovery mount options.
2015-12-03 01:30:40 +00:00
Tao Bao
269d785ce0 releasetools: Always use recovery mount options.
Change-Id: I6e96c417ffb5ad36405f4a6f5342f80f358f375f
2015-12-02 15:51:47 -08:00
Tao Bao
b569dbd039 Merge "releasetools: Abort the update on apply_patch failures." am: 2a23c0c859 am: d77af53fc6
am: 21362f024b

* commit '21362f024b62e9ebab89c9a813229b4bd0bc9369':
  releasetools: Abort the update on apply_patch failures.
2015-12-02 22:10:02 +00:00
Tao Bao
21362f024b Merge "releasetools: Abort the update on apply_patch failures." am: 2a23c0c859
am: d77af53fc6

* commit 'd77af53fc673229a1e9b59d99592272f689df10f':
  releasetools: Abort the update on apply_patch failures.
2015-12-02 22:05:02 +00:00
Tao Bao
d77af53fc6 Merge "releasetools: Abort the update on apply_patch failures."
am: 2a23c0c859

* commit '2a23c0c85919bada137985f9e3b32514185b38c5':
  releasetools: Abort the update on apply_patch failures.
2015-12-02 22:00:18 +00:00
Tao Bao
c386890d0e releasetools: Abort the update on apply_patch failures.
We used to silently ignore the return value from apply_patch() even if
it had failed. It gives us more trouble to investigate the failure when
the affected file/partition gets touched in subsequent OTAs. This CL
adds the checking of the return value and aborts the update accordingly.

Bug: 25893277
Change-Id: Ie5e1c563576e503343e6a5b28ed4d7039f6f919c
2015-12-02 12:26:57 -08:00
Shinichiro Hamaji
8f2968f095 Remove warnings from ijar/classfile.cc
Also add -Werror.

Change-Id: I2f9fda288d31bd34735856ade33916c93c45922a
2015-12-01 16:44:32 +09:00
Colin Cross
f344fe0850 Merge changes I1de10391,I4399ca26,Iec3b2b0b am: bff3c9b4c1 am: bae8872294
am: dbeab8de65

* commit 'dbeab8de6543db1d0393789cb18ee7fd7ed8fedd':
  Use libstdc++ for ijar
  Build ijar for apps build
  Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
2015-12-01 00:07:45 +00:00