Commit Graph

27082 Commits

Author SHA1 Message Date
Shinichiro Hamaji
f562875d0c Merge "Make apks depend on their certificates"
am: f0a465c2cb

* commit 'f0a465c2cb5921762d7d17d65cd7352d0f64c261':
  Make apks depend on their certificates

Change-Id: I1f89af20d7d4cb337a91203631ff68eb654b0e0c
2016-05-17 04:05:46 +00:00
Shinichiro Hamaji
f0a465c2cb Merge "Make apks depend on their certificates" 2016-05-17 03:58:32 +00:00
Dan Willemsen
19fdc4428f Merge "Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV"
am: a794f4db22

* commit 'a794f4db220d0f357773a037d842f40ab463485f':
  Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV

Change-Id: I7b1fcc43e7c2260632c61e29f0d6bfb41df1b812
2016-05-17 03:03:01 +00:00
Dan Willemsen
a794f4db22 Merge "Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV" 2016-05-17 02:53:50 +00:00
Dan Willemsen
db16dd2384 Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV
Instead, use the libgcc/libatomic/libgcov from the static libraries dir,
which is provided by Soong. Copy the libraries using the Soong script if
Soong is disabled - this can be removed once USE_SOONG is removed.

Change-Id: Iad2ad20ad5c3cfc48bf1e46e594a482609098d7a
2016-05-16 17:26:54 -07:00
Alex Klyubin
5e09800c76 Merge "No need to JAR-sign OTA update packages."
am: 094caf99aa

* commit '094caf99aab48c7ef62fd635503a0c70c18ecfde':
  No need to JAR-sign OTA update packages.

Change-Id: I0a0e73cc5f64ba20600c30b9f304b0ff06705693
2016-05-16 17:18:20 +00:00
Alex Klyubin
094caf99aa Merge "No need to JAR-sign OTA update packages." 2016-05-16 17:11:04 +00:00
Dan Willemsen
b8759f4f4b Merge "Soong: Read Android.soong.mk if skipping Android.mk"
am: ea71c96894

* commit 'ea71c968943209f41191a1f164f899dd002b9119':
  Soong: Read Android.soong.mk if skipping Android.mk

Change-Id: I76aa5c350a26ea718df36f1df4ba5ade3f49a478
2016-05-13 23:56:11 +00:00
Treehugger Robot
ea71c96894 Merge "Soong: Read Android.soong.mk if skipping Android.mk" 2016-05-13 23:52:08 +00:00
Dan Willemsen
5b188fb539 Soong: Read Android.soong.mk if skipping Android.mk
If Soong is enabled, and we're skipping an Android.mk because there is
an Android.bp file, check for an Android.soong.mk file and read that
instead. This will allow us to temporarily define modules or recurse
into subdirectories that soong does not yet support.

Change-Id: Ifdb2f0204a38a5069e53527f66ffcfb8008c11a4
2016-05-13 16:10:41 -07:00
Colin Cross
c33da56ff3 Merge "Default USE_SOONG to true"
am: ac33935ac1

* commit 'ac33935ac1721c640ce39b722cb7471ea9a5949d':
  Default USE_SOONG to true

Change-Id: Ie75c39b174b20af51e13bd7f6e0dfdb50d903233
2016-05-13 22:44:16 +00:00
Colin Cross
ac33935ac1 Merge "Default USE_SOONG to true" 2016-05-13 22:40:23 +00:00
Dan Willemsen
33b3051784 Merge "Don\'t use GTEST_OS_LINUX on Darwin"
am: 439f4dd189

* commit '439f4dd1895eef8684b3257fe5631a45d51635d6':
  Don't use GTEST_OS_LINUX on Darwin

Change-Id: Ie05e2df72a2cbfa52d6b767cd009c36a640ef23e
2016-05-13 22:33:48 +00:00
Evgenii Stepanov
5bd91e69f7 Merge "Pass USE_SAFESTACK to Soong."
am: 00bccf54d4

* commit '00bccf54d4b3847cf54f6507c8fa29eabf26f2e7':
  Pass USE_SAFESTACK to Soong.

Change-Id: I9258135b2debee97b21de27232a7530780a63f5d
2016-05-13 22:33:47 +00:00
Dan Willemsen
439f4dd189 Merge "Don't use GTEST_OS_LINUX on Darwin" 2016-05-13 22:29:16 +00:00
Evgenii Stepanov
00bccf54d4 Merge "Pass USE_SAFESTACK to Soong." 2016-05-13 22:24:52 +00:00
Evgenii Stepanov
7f13ab998a Pass USE_SAFESTACK to Soong.
Change-Id: I51a94da0942aa1a1e003c134a30e8da82e1270b8
2016-05-13 14:40:58 -07:00
Dan Willemsen
66fced615f Don't use GTEST_OS_LINUX on Darwin
Change-Id: If77118591daa7b474e6989e03109ea32ddd357b2
2016-05-13 21:10:50 +00:00
Ian Rogers
f87e3bb296 Merge "Make Error Prone warnings in sync with Error Prone documenation."
am: 86c3b72d9c

* commit '86c3b72d9c9cb46acd7b8339dc3ce0a2f869fb2f':
  Make Error Prone warnings in sync with Error Prone documenation.

Change-Id: I78b111feb108096a9b38c798dd4ee666a6852797
2016-05-13 18:21:57 +00:00
Ian Rogers
86c3b72d9c Merge "Make Error Prone warnings in sync with Error Prone documenation." 2016-05-13 18:19:18 +00:00
Mohamad Ayyash
09bb85af92 Merge "Use fs_config files for mksquashfs"
am: 4730facd73

* commit '4730facd7399ead0d753d7b588001faf6469e041':
  Use fs_config files for mksquashfs

Change-Id: I3c7c7c618e18598cda56f153d9ac8a988ef85510
2016-05-13 18:16:05 +00:00
Treehugger Robot
4730facd73 Merge "Use fs_config files for mksquashfs" 2016-05-13 18:13:22 +00:00
Ian Rogers
6e52003b54 Make Error Prone warnings in sync with Error Prone documenation.
Use summary information from annotation within Error Prone to auto-generate
the warnings list.

Bug: 28681096
Change-Id: Ib3a5f734bd229726fcd7332eaa9e0e1bd1200c25
2016-05-13 10:18:18 -07:00
Shinichiro Hamaji
641e61cb53 Make apks depend on their certificates
Bug: 27954979
Change-Id: I02db576cb80cbb9dd684d931da02e1b3b3efdf37
2016-05-13 16:03:24 +09:00
Shinichiro Hamaji
505f1eaaa9 Merge "Follow symlinks when using find for assets"
am: 4c4c06016b

* commit '4c4c06016bfe62fde1aaf2fff33d6f6c55f78b89':
  Follow symlinks when using find for assets

Change-Id: I62fc48be86bbbac6e0d2f09e398a4922fe21668a
2016-05-13 05:24:35 +00:00
Shinichiro Hamaji
4c4c06016b Merge "Follow symlinks when using find for assets" 2016-05-13 05:20:05 +00:00
Mohamad Ayyash
465acf8631 Use fs_config files for mksquashfs
BUG: 27467028
Change-Id: I7648030ad4b31d70a5d439e9552fd2cbfe288b74
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
BUG: 28704419
2016-05-12 18:44:48 -07:00
Dan Willemsen
bcbba61a25 Merge "Read Soong-exported configuration"
am: c7b610a67e

* commit 'c7b610a67ebff333cede41d5f336165485c9ae5d':
  Read Soong-exported configuration

Change-Id: I0890077c980e0e9d863809bc02fbb8e2f5aa8018
2016-05-13 01:40:48 +00:00
Dan Willemsen
c7b610a67e Merge "Read Soong-exported configuration" 2016-05-13 01:36:28 +00:00
Dan Willemsen
f8c5eac739 Merge "Use product-specific Soong outputs"
am: f100d01dd5

* commit 'f100d01dd5dde712a19bd75f8f6895b21641bd62':
  Use product-specific Soong outputs

Change-Id: I530778730be7424be3d3fbe88fd65fc70d2a0d12
2016-05-12 20:43:47 +00:00
Dan Willemsen
8b999ac63d Read Soong-exported configuration
This is to ensure that Make and Soong agree on configuration variables
like TARGET_GLOBAL_CFLAGS. Only a few variables are actually checked
currently until we make more actually the same.

Bug: 23566674
Change-Id: Ibede43d933ede4d470e182f9490ea6ec4ef52fbc
2016-05-12 13:36:33 -07:00
Dan Willemsen
f100d01dd5 Merge "Use product-specific Soong outputs" 2016-05-12 20:33:05 +00:00
Alex Klyubin
2c7da1d5c7 Merge "Offer an ApkSignerEngine implementation."
am: 6975f03fd8

* commit '6975f03fd8b65c294a08ebc40be7da871e9e74d7':
  Offer an ApkSignerEngine implementation.

Change-Id: I7ab04e1e9699219bb5204c2b656b47583a399e31
2016-05-12 18:45:58 +00:00
Alex Klyubin
6975f03fd8 Merge "Offer an ApkSignerEngine implementation." 2016-05-12 18:43:08 +00:00
Alex Klyubin
0caa16a6d1 No need to JAR-sign OTA update packages.
This removes the logic for JAR signing from -w (whole-file signing)
mode. This mode is designed specifically for OTA update packages. When
such packages are verified, their JAR signatures are ignored. Thus,
there is no need to JAR-sign in -w mode.

For context, OTA update packages are protected by a special signature
residing in the ZIP End of Central Directory record (at the very end
of the file). This is the signature verified when update packages are
being applied to Android.

Change-Id: Ia852a11ed6774ce746087cdd7f028b191ef6bc8b
2016-05-12 11:32:43 -07:00
Alex Klyubin
e305f45f00 Offer an ApkSignerEngine implementation.
This adds an implementation of ApkSignerEngine to the apksigner-core
library.

Bug: 27461702
Change-Id: I5f977b98555ca507a0dfcd3e92eecb9758aa8370
2016-05-12 10:56:06 -07:00
Shinichiro Hamaji
d8f9f7d873 Follow symlinks when using find for assets
This should have been done in
https://android-review.googlesource.com/#/c/43901/

Bug: 27954979
Change-Id: I663b5e87e0d844d37a59e404219ff5e7e364df74
2016-05-12 18:17:02 +09:00
Shinichiro Hamaji
eac63ed087 Merge "Correct some dependencies around zip packages"
am: b6f2c8fac8

* commit 'b6f2c8fac8246ed7e6a1d25bf9cc0e658504813a':
  Correct some dependencies around zip packages

Change-Id: I59e2597e955e69a35edbd0fa13bb1eb4d076b456
2016-05-12 02:20:36 +00:00
Shinichiro Hamaji
b6f2c8fac8 Merge "Correct some dependencies around zip packages" 2016-05-12 02:06:42 +00:00
Wei Wang
a22d0a88ba Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation"
am: 648ea82b04

* commit '648ea82b048a83dfcc68aa3419523502b3a1485f':
  Include BRILLO_VENDOR_PARTITIONS in target zip generation

Change-Id: I9aa55d82d8121b66dd853cf434b2a68b4dbbab68
2016-05-11 21:57:08 +00:00
Chih-Hung Hsieh
16af95b4a5 Merge "Add misc-macro-parentheses to default tidy checks."
am: a55b7ec4c3

* commit 'a55b7ec4c38f5de172d51e805215505196c7702d':
  Add misc-macro-parentheses to default tidy checks.

Change-Id: I2e93d50500ee3c6746aa805f0f6b268c07687c7f
2016-05-11 21:57:03 +00:00
Treehugger Robot
648ea82b04 Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation" 2016-05-11 21:49:56 +00:00
Treehugger Robot
a55b7ec4c3 Merge "Add misc-macro-parentheses to default tidy checks." 2016-05-11 21:44:21 +00:00
Chih-Hung Hsieh
e1ea9434c1 Add misc-macro-parentheses to default tidy checks.
* Disable this check in external projects.

Bug: 28705665
Change-Id: Ia44a15765fd637dae36b5e0f2b59ee4280b139c9
2016-05-11 13:43:11 -07:00
Chih-Hung Hsieh
a2c8976011 Merge "Fix misc-macro-parentheses warnings."
am: bc0ab6d133

* commit 'bc0ab6d1337802a52d2ba07897d58085f128857d':
  Fix misc-macro-parentheses warnings.

Change-Id: I3b3d4d2cdcc9e26bdf8cf6cb8586f333421a2a81
2016-05-11 20:39:19 +00:00
Chih-hung Hsieh
bc0ab6d133 Merge "Fix misc-macro-parentheses warnings." 2016-05-11 20:30:47 +00:00
Wei Wang
2e735ca34e Include BRILLO_VENDOR_PARTITIONS in target zip generation
This change will enable the target zip to include partition defined in
BRILLO_VENDOR_PARTITIONS. This is necessary for OTA to support
partitions other than boot and system in ab_partitions.txt.

The target zip will include images in BRILLO_VENDOR_PARTITIONS if
defined, under VENDOR_IMAGES/ with path kept. Also any vendor partitions
defined in AB_OTA_PARTITIONS will be copied to IMAGES/ in the target zip.

BUG: 28623063
Change-Id: Ic479048dfb8ac506acf827865e784fcb0432a1d5
2016-05-11 12:26:04 -07:00
Ian Rogers
086e70d0c9 Merge "Add code search links to warnings."
am: adf2141b66

* commit 'adf2141b665ed2329c5f417acbaba56adb8d2240':
  Add code search links to warnings.

Change-Id: I249d561788480a2cb0cb532a00cb95bd478fbe2a
2016-05-11 19:16:31 +00:00
Ian Rogers
adf2141b66 Merge "Add code search links to warnings." 2016-05-11 19:07:36 +00:00
Chih-Hung Hsieh
f536e7ba34 Fix misc-macro-parentheses warnings.
Add parentheses around macro arguments used beside binary operators.

Bug: 28705665
Change-Id: I8594b9463e2389a46d6e0235757b93de065cd007
2016-05-11 11:55:33 -07:00