Commit Graph

11039 Commits

Author SHA1 Message Date
Dan Willemsen
53e3899222 Fix GET-INSTALL-PATH to work with Soong
This was printing all of the Soong modules in addition to the modules
defined in the ONE_SHOT_MAKEFILE. So replicate what we did with
MODULES-IN-* with GET-INSTALL-PATH-IN-* and update all the users.

Bug: 30191725
Change-Id: Ib1e4bf00f64d7a3e8cd91f44eaf1ff82fdfbf162
2016-08-12 05:10:51 +00:00
Colin Cross
94219ae942 Merge "Fix discrepancy in SANITIZE_TARGET format with soong." am: 0d86fc57cd am: 0216097482
am: b8c54d7966

Change-Id: I89855ef8608e91b3ee046b237cc531ab7ab7d78e
2016-08-12 00:10:29 +00:00
Colin Cross
b8c54d7966 Merge "Fix discrepancy in SANITIZE_TARGET format with soong." am: 0d86fc57cd
am: 0216097482

Change-Id: Ia45aaf2ac6e36b3d960d97a65ecccd7ca6da83d3
2016-08-12 00:06:25 +00:00
Colin Cross
0216097482 Merge "Fix discrepancy in SANITIZE_TARGET format with soong."
am: 0d86fc57cd

Change-Id: Ib643a2d9682eabd494f40a0d5b7fbaeb42583d30
2016-08-12 00:04:38 +00:00
Colin Cross
0d86fc57cd Merge "Fix discrepancy in SANITIZE_TARGET format with soong." 2016-08-11 23:53:29 +00:00
Adam Seaton
bd18f04bd3 Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c am: 1f85078b1e am: 782967785e
am: 7171325d0b

Change-Id: I114a7c8b86cdddbe1333ceb8ac7668c3ae0b8d10
2016-08-11 21:58:46 +00:00
Adam Seaton
831bee139d Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c am: 1f85078b1e
am: 782967785e

Change-Id: Ic5565af400aa3d3c245d5ab25d65a6244a46907d
2016-08-11 21:55:18 +00:00
Adam Seaton
7171325d0b Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c am: 1f85078b1e
am: 782967785e

Change-Id: Ia8cb06a26fc6856a85bbd3d6266eb41034bd600a
2016-08-11 21:55:18 +00:00
Adam Seaton
782967785e Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c
am: 1f85078b1e

Change-Id: Id8709a33bf19fb106341a8aed5f2978adf91a7ef
2016-08-11 21:51:46 +00:00
Adam Seaton
1f85078b1e Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6
am: 21b4d9e01c

Change-Id: I24dd917aef85ca2bb36b310ed97e57fbedac4558
2016-08-11 21:48:46 +00:00
Adam Seaton
21b4d9e01c Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2
am: fdf4c8d8a6

Change-Id: I5ad798a99ea890bff77c9cd579a72e3794df92e0
2016-08-11 21:45:16 +00:00
Adam Seaton
fdf4c8d8a6 Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ)
am: fa721839b2

Change-Id: Iff74354f3540185eff4ae1b44600f5d00e1029cd
2016-08-11 21:41:45 +00:00
Dan Willemsen
d479b69c0e Merge "Use soong_zip and zip2zip to make dist faster" am: 6dcdb45485 am: 96963dfd4d
am: 592cfc1859

Change-Id: Id9a60ebbd282026ab7a0ff5bc85757a5c545ffb7
2016-08-11 19:40:10 +00:00
Adam Seaton
fa721839b2 Update Security String to 2016-09-06 to platform and CTS for September
Security (+Quadrooter,-PZ)

Change-Id: I248efb2cbd877b4954994077df0f90adcf332f4a
2016-08-11 12:39:25 -07:00
Dan Willemsen
592cfc1859 Merge "Use soong_zip and zip2zip to make dist faster" am: 6dcdb45485
am: 96963dfd4d

Change-Id: I0f19fc1908f84da6f602564d57256423b108bf16
2016-08-11 19:36:44 +00:00
Dan Willemsen
96963dfd4d Merge "Use soong_zip and zip2zip to make dist faster"
am: 6dcdb45485

Change-Id: I9a4241b436f7dead5de7b02d3af56004b1eed42f
2016-08-11 19:33:10 +00:00
Treehugger Robot
6dcdb45485 Merge "Use soong_zip and zip2zip to make dist faster" 2016-08-11 19:28:14 +00:00
Dan Albert
072cfe202e Merge "Add support for NDK r13." am: 287093a98c am: ae49ab2f0f
am: 56745f6c7b

Change-Id: If8145c8aa89545aa4668afc7f1e4d8577b36b6d5
2016-08-11 16:59:52 +00:00
Dan Albert
56745f6c7b Merge "Add support for NDK r13." am: 287093a98c
am: ae49ab2f0f

Change-Id: Ie8530ae07fb60b2dd15d2d88cecf9fad1458a337
2016-08-11 16:56:10 +00:00
Dan Albert
ae49ab2f0f Merge "Add support for NDK r13."
am: 287093a98c

Change-Id: I8e10422cdd20d3ee0402acabbdbe60a41ba59901
2016-08-11 16:52:52 +00:00
Dan Willemsen
5e29cad1d5 Use soong_zip and zip2zip to make dist faster
soong_zip parallelizes the compression when creating a zip file, which
makes these packaging steps far shorter.

zip2zip skips the decompression and recompression during the -img- file
creation.

For an aosp_arm64-eng aosp/master build:

target_files.zip: 92s to 60s
symbols.zip: 147s to 7s
img.zip: 64s to 0.5s

There's still room to parallelize the image compression during
target_files.zip (add_img_to_target_files step takes most of the time)

Change-Id: I7b6a91e4a7dbeda2e49ca936b10181cff2f973d7
2016-08-10 16:13:58 -07:00
Dan Albert
0960770e0d Add support for NDK r13.
Test: make checkbuild
Change-Id: I4521c768c67771cee9df9e59ed45344c40c48a38
2016-08-10 16:05:19 -07:00
Duane Sand
47b57e6bd2 Allowing pairing mips64r6 with mips32r1 and r2
On mips64r6 builds, the shell variable ARCH_MIPS_REV6 is not
cleared before compiling 2nd arch parts.  This bug is harmless when
2nd arch is mips32r6 but it omits needed mips-specific assembly
files when compiling libagl and libpixelflinger for mips32r1 or r2.

Clearing the variable is impractical.  Using TARGET_2ND_ARCH qualifiers
would work, but Arm and x86 use a simpler method with distinct ARCH_ARM
and ARCH_ARM64 symbols.  ARCH_MIPS_REV6 is used in two places.
Both controll 32-bit parts only, so neither place needs adjustment.

Change-Id: Id1ea5e8b6f8666d9df219fa9ef41834bd31f5dd8
2016-08-10 12:13:30 -07:00
Alex Deymo
5134712d6f Install the update-payload-key in the recovery image as well.
The update-payload-key is required to verify the contents of the OTA in
recovery while sideloading an update.

Bug: 27178350
TEST=`make` builds a boot.img with the payload key in recovery.

(cherry picked from commit c6ebe9fcd7)

Change-Id: I0128d7f684d32201e227acce798b25f12982eaaa
2016-08-10 11:10:11 -07:00
Alex Deymo
e8fbea342f Merge changes from topic 'ab_sideload' am: 3750ed3e17 am: 93ff77ad1a
am: 820bc82bed

Change-Id: I0dcac2e3cdbc3114a88d7ca49054a15bd9ccb292
2016-08-10 05:07:24 +00:00
Alex Deymo
820bc82bed Merge changes from topic 'ab_sideload' am: 3750ed3e17
am: 93ff77ad1a

Change-Id: Idbe285c05dfb9b4b6252ef87a3066f8a41f13044
2016-08-10 05:04:23 +00:00
Alex Deymo
93ff77ad1a Merge changes from topic 'ab_sideload'
am: 3750ed3e17

Change-Id: I4afbecc40068c7a87c7532b22a404319c24e2c05
2016-08-10 05:00:57 +00:00
Alex Deymo
3750ed3e17 Merge changes from topic 'ab_sideload'
* changes:
  Replace OTA sideload verification key when signing A/B devices.
  Install the update-payload-key in the recovery image as well.
2016-08-10 03:55:24 +00:00
Ian Pedowitz
d0528b4463 N-DR/N-MR1 is 7.1
Bug: 30734691
Change-Id: I20a4e705ad972bbf24fb0aab65ab410c11496199
2016-08-09 16:44:23 -07:00
Nick Desaulniers
f4d5aff88b build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT am: d491fcf438
am: 92579193db

Change-Id: I96bb57fb5e2e35a7f3fdfc4e38a93a2ea9d4f558
2016-08-09 20:58:25 +00:00
Nick Desaulniers
92579193db build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT
am: d491fcf438

Change-Id: I1e054a5eb22680fa02f19bdf979bba4f75347dd9
2016-08-09 20:55:20 +00:00
TreeHugger Robot
9b9520018b Merge "build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT" into nyc-mr1-dev 2016-08-09 20:51:33 +00:00
Nick Desaulniers
d491fcf438 build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT
Bug: 30681215
Change-Id: Ic3a18a65f9b1251c2592fc54569b2c6af99e6ece
2016-08-09 12:29:26 -07:00
Dan Albert
a776f6fd27 Merge "Account for LOCAL_NDK_VERSION when packaging." am: a1374de305 am: 43c41aea18
am: 65b899a628

Change-Id: I9526932252187255ecd6ceed094411660ebc20d9
2016-08-09 01:44:42 +00:00
Dan Albert
65b899a628 Merge "Account for LOCAL_NDK_VERSION when packaging." am: a1374de305
am: 43c41aea18

Change-Id: Ib67b829f3989ba353d4031dca89ba90e792a73ca
2016-08-09 01:42:12 +00:00
Dan Albert
43c41aea18 Merge "Account for LOCAL_NDK_VERSION when packaging."
am: a1374de305

Change-Id: I37d554e931ef125a888ffc2bdf6e6e2f031d89e1
2016-08-09 01:39:43 +00:00
Treehugger Robot
a1374de305 Merge "Account for LOCAL_NDK_VERSION when packaging." 2016-08-09 01:36:23 +00:00
Adam Seaton
402c6f5eeb Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2 am: 68870731a5 am: f7de14b8a1 am: 2d033a9e51
am: 76582b95d1

Change-Id: I824632c35828fb60772af0e8fdc456d93e66f85e
2016-08-09 00:16:10 +00:00
Dan Albert
609fa6c0c3 Account for LOCAL_NDK_VERSION when packaging.
Previously an app built with `LOCAL_NDK_VERSION := r10` would still
be packaged with r11's library.

Test: make checkbuild
Change-Id: I1dcbd65057adaa1af605b9770283f7da994fc3cf
2016-08-08 17:13:31 -07:00
Adam Seaton
143faf4aa4 Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2 am: 68870731a5 am: f7de14b8a1
am: 2d033a9e51

Change-Id: Iacc3e198cff56bdd396a64e594d19e4ca635c3e4
2016-08-09 00:11:11 +00:00
Adam Seaton
76582b95d1 Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2 am: 68870731a5 am: f7de14b8a1
am: 2d033a9e51

Change-Id: If10e5e34fcd4621c0c7b444f557b7c5c99081007
2016-08-09 00:09:06 +00:00
Adam Seaton
2d033a9e51 Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2 am: 68870731a5
am: f7de14b8a1

Change-Id: I1412b8cee615535abe366b43ce4041efb4488bde
2016-08-09 00:05:36 +00:00
Adam Seaton
f7de14b8a1 Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2
am: 68870731a5

Change-Id: I3e302e74d090485c179381a085d39d17bc212d67
2016-08-08 23:57:05 +00:00
Adam Seaton
68870731a5 Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e
am: e158db8ad2

Change-Id: I61ddf7619069a6dc3bb10a70c6eca4d55a33c3fe
2016-08-08 23:54:05 +00:00
Adam Seaton
e158db8ad2 Update Security String to 2016-09-07 to platform and CTS for September respin
am: a53b868e6e

Change-Id: I0655a62b517357f75022f902d26b44a5c8aeaf85
2016-08-08 23:48:10 +00:00
Chih-hung Hsieh
ded6bb0ee6 Merge "Simplify DEFAULT_LOCAL_TIDY_CHECKS." am: 4d9d191ee7 am: e79eae70f4
am: b847aeabd6

Change-Id: Ia3aa9abdfbb0f4860bed3b513b6cf4ebe852b747
2016-08-08 23:42:34 +00:00
Chih-hung Hsieh
b847aeabd6 Merge "Simplify DEFAULT_LOCAL_TIDY_CHECKS." am: 4d9d191ee7
am: e79eae70f4

Change-Id: I0a9444855d9ec00fba919d9812a373a3f468d23a
2016-08-08 23:40:05 +00:00
Chih-hung Hsieh
e79eae70f4 Merge "Simplify DEFAULT_LOCAL_TIDY_CHECKS."
am: 4d9d191ee7

Change-Id: I28ec175909e7993f84089846c7c25f516aa1bf02
2016-08-08 23:37:35 +00:00
Chih-hung Hsieh
4d9d191ee7 Merge "Simplify DEFAULT_LOCAL_TIDY_CHECKS." 2016-08-08 23:22:13 +00:00
Adam Seaton
a53b868e6e Update Security String to 2016-09-07 to platform and CTS for September
respin

Change-Id: I6ec8efad5b8e45bcf9df79fb54824acc92755a3b
2016-08-08 15:08:45 -07:00