OSDN Git Service
Dan Willemsen [Fri, 13 May 2016 23:56:11 +0000 (23:56 +0000)]
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
Treehugger Robot [Fri, 13 May 2016 23:52:07 +0000 (23:52 +0000)]
Merge "Soong: Read Android.soong.mk if skipping Android.mk"
Dan Willemsen [Fri, 13 May 2016 22:58:52 +0000 (15:58 -0700)]
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
Colin Cross [Fri, 13 May 2016 22:44:16 +0000 (22:44 +0000)]
Merge "Default USE_SOONG to true"
am:
ac33935ac1
* commit '
ac33935ac1721c640ce39b722cb7471ea9a5949d':
Default USE_SOONG to true
Change-Id: Ie75c39b174b20af51e13bd7f6e0dfdb50d903233
Colin Cross [Fri, 13 May 2016 22:40:23 +0000 (22:40 +0000)]
Merge "Default USE_SOONG to true"
Dan Willemsen [Fri, 13 May 2016 22:33:48 +0000 (22:33 +0000)]
Merge "Don\'t use GTEST_OS_LINUX on Darwin"
am:
439f4dd189
* commit '
439f4dd1895eef8684b3257fe5631a45d51635d6':
Don't use GTEST_OS_LINUX on Darwin
Change-Id: Ie05e2df72a2cbfa52d6b767cd009c36a640ef23e
Evgenii Stepanov [Fri, 13 May 2016 22:33:47 +0000 (22:33 +0000)]
Merge "Pass USE_SAFESTACK to Soong."
am:
00bccf54d4
* commit '
00bccf54d4b3847cf54f6507c8fa29eabf26f2e7':
Pass USE_SAFESTACK to Soong.
Change-Id: I9258135b2debee97b21de27232a7530780a63f5d
Dan Willemsen [Fri, 13 May 2016 22:29:16 +0000 (22:29 +0000)]
Merge "Don't use GTEST_OS_LINUX on Darwin"
Evgenii Stepanov [Fri, 13 May 2016 22:24:52 +0000 (22:24 +0000)]
Merge "Pass USE_SAFESTACK to Soong."
Evgenii Stepanov [Fri, 13 May 2016 01:03:23 +0000 (18:03 -0700)]
Pass USE_SAFESTACK to Soong.
Change-Id: I51a94da0942aa1a1e003c134a30e8da82e1270b8
Dan Willemsen [Wed, 9 Mar 2016 19:01:43 +0000 (11:01 -0800)]
Don't use GTEST_OS_LINUX on Darwin
Change-Id: If77118591daa7b474e6989e03109ea32ddd357b2
Ian Rogers [Fri, 13 May 2016 18:21:57 +0000 (18:21 +0000)]
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
Ian Rogers [Fri, 13 May 2016 18:19:18 +0000 (18:19 +0000)]
Merge "Make Error Prone warnings in sync with Error Prone documenation."
Mohamad Ayyash [Fri, 13 May 2016 18:16:05 +0000 (18:16 +0000)]
Merge "Use fs_config files for mksquashfs"
am:
4730facd73
* commit '
4730facd7399ead0d753d7b588001faf6469e041':
Use fs_config files for mksquashfs
Change-Id: I3c7c7c618e18598cda56f153d9ac8a988ef85510
Treehugger Robot [Fri, 13 May 2016 18:13:22 +0000 (18:13 +0000)]
Merge "Use fs_config files for mksquashfs"
Ian Rogers [Fri, 13 May 2016 15:59:00 +0000 (08:59 -0700)]
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
Shinichiro Hamaji [Fri, 13 May 2016 05:24:35 +0000 (05:24 +0000)]
Merge "Follow symlinks when using find for assets"
am:
4c4c06016b
* commit '
4c4c06016bfe62fde1aaf2fff33d6f6c55f78b89':
Follow symlinks when using find for assets
Change-Id: I62fc48be86bbbac6e0d2f09e398a4922fe21668a
Shinichiro Hamaji [Fri, 13 May 2016 05:20:05 +0000 (05:20 +0000)]
Merge "Follow symlinks when using find for assets"
Mohamad Ayyash [Fri, 8 Apr 2016 05:10:51 +0000 (22:10 -0700)]
Use fs_config files for mksquashfs
BUG:
27467028
Change-Id: I7648030ad4b31d70a5d439e9552fd2cbfe288b74
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
BUG:
28704419
Dan Willemsen [Fri, 13 May 2016 01:40:48 +0000 (01:40 +0000)]
Merge "Read Soong-exported configuration"
am:
c7b610a67e
* commit '
c7b610a67ebff333cede41d5f336165485c9ae5d':
Read Soong-exported configuration
Change-Id: I0890077c980e0e9d863809bc02fbb8e2f5aa8018
Dan Willemsen [Fri, 13 May 2016 01:36:28 +0000 (01:36 +0000)]
Merge "Read Soong-exported configuration"
Dan Willemsen [Thu, 12 May 2016 20:43:47 +0000 (20:43 +0000)]
Merge "Use product-specific Soong outputs"
am:
f100d01dd5
* commit '
f100d01dd5dde712a19bd75f8f6895b21641bd62':
Use product-specific Soong outputs
Change-Id: I530778730be7424be3d3fbe88fd65fc70d2a0d12
Dan Willemsen [Tue, 29 Mar 2016 19:32:16 +0000 (12:32 -0700)]
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
Dan Willemsen [Thu, 12 May 2016 20:33:05 +0000 (20:33 +0000)]
Merge "Use product-specific Soong outputs"
Alex Klyubin [Thu, 12 May 2016 18:45:58 +0000 (18:45 +0000)]
Merge "Offer an ApkSignerEngine implementation."
am:
6975f03fd8
* commit '
6975f03fd8b65c294a08ebc40be7da871e9e74d7':
Offer an ApkSignerEngine implementation.
Change-Id: I7ab04e1e9699219bb5204c2b656b47583a399e31
Alex Klyubin [Thu, 12 May 2016 18:43:08 +0000 (18:43 +0000)]
Merge "Offer an ApkSignerEngine implementation."
Alex Klyubin [Wed, 11 May 2016 19:48:27 +0000 (12:48 -0700)]
Offer an ApkSignerEngine implementation.
This adds an implementation of ApkSignerEngine to the apksigner-core
library.
Bug:
27461702
Change-Id: I5f977b98555ca507a0dfcd3e92eecb9758aa8370
Shinichiro Hamaji [Thu, 12 May 2016 09:15:28 +0000 (18:15 +0900)]
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
Shinichiro Hamaji [Thu, 12 May 2016 02:20:36 +0000 (02:20 +0000)]
Merge "Correct some dependencies around zip packages"
am:
b6f2c8fac8
* commit '
b6f2c8fac8246ed7e6a1d25bf9cc0e658504813a':
Correct some dependencies around zip packages
Change-Id: I59e2597e955e69a35edbd0fa13bb1eb4d076b456
Shinichiro Hamaji [Thu, 12 May 2016 02:06:42 +0000 (02:06 +0000)]
Merge "Correct some dependencies around zip packages"
Wei Wang [Wed, 11 May 2016 21:57:08 +0000 (21:57 +0000)]
Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation"
am:
648ea82b04
* commit '
648ea82b048a83dfcc68aa3419523502b3a1485f':
Include BRILLO_VENDOR_PARTITIONS in target zip generation
Change-Id: I9aa55d82d8121b66dd853cf434b2a68b4dbbab68
Chih-Hung Hsieh [Wed, 11 May 2016 21:57:03 +0000 (21:57 +0000)]
Merge "Add misc-macro-parentheses to default tidy checks."
am:
a55b7ec4c3
* commit '
a55b7ec4c38f5de172d51e805215505196c7702d':
Add misc-macro-parentheses to default tidy checks.
Change-Id: I2e93d50500ee3c6746aa805f0f6b268c07687c7f
Treehugger Robot [Wed, 11 May 2016 21:49:56 +0000 (21:49 +0000)]
Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation"
Treehugger Robot [Wed, 11 May 2016 21:44:20 +0000 (21:44 +0000)]
Merge "Add misc-macro-parentheses to default tidy checks."
Chih-Hung Hsieh [Wed, 11 May 2016 20:39:48 +0000 (13:39 -0700)]
Add misc-macro-parentheses to default tidy checks.
* Disable this check in external projects.
Bug:
28705665
Change-Id: Ia44a15765fd637dae36b5e0f2b59ee4280b139c9
Chih-Hung Hsieh [Wed, 11 May 2016 20:39:19 +0000 (20:39 +0000)]
Merge "Fix misc-macro-parentheses warnings."
am:
bc0ab6d133
* commit '
bc0ab6d1337802a52d2ba07897d58085f128857d':
Fix misc-macro-parentheses warnings.
Change-Id: I3b3d4d2cdcc9e26bdf8cf6cb8586f333421a2a81
Chih-hung Hsieh [Wed, 11 May 2016 20:30:47 +0000 (20:30 +0000)]
Merge "Fix misc-macro-parentheses warnings."
Wei Wang [Wed, 11 May 2016 05:48:13 +0000 (22:48 -0700)]
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
Ian Rogers [Wed, 11 May 2016 19:16:31 +0000 (19:16 +0000)]
Merge "Add code search links to warnings."
am:
adf2141b66
* commit '
adf2141b665ed2329c5f417acbaba56adb8d2240':
Add code search links to warnings.
Change-Id: I249d561788480a2cb0cb532a00cb95bd478fbe2a
Ian Rogers [Wed, 11 May 2016 19:07:36 +0000 (19:07 +0000)]
Merge "Add code search links to warnings."
Chih-Hung Hsieh [Wed, 11 May 2016 18:55:33 +0000 (11:55 -0700)]
Fix misc-macro-parentheses warnings.
Add parentheses around macro arguments used beside binary operators.
Bug:
28705665
Change-Id: I8594b9463e2389a46d6e0235757b93de065cd007
Shinichiro Hamaji [Tue, 10 May 2016 07:40:38 +0000 (16:40 +0900)]
Correct some dependencies around zip packages
Add scripts which creates these packages to their dependencies.
$(SYMBOLS_ZIP) contains symbol info of the updater binary so
it should depend on it.
Bug:
27954979
Change-Id: If78746ec843dd57fe5fdda3ed504a12bb298ea1d
Wei Wang [Wed, 11 May 2016 15:18:42 +0000 (15:18 +0000)]
Merge "Revert "Include vendor partitions in target zip generation""
am:
7ff7c2d870
* commit '
7ff7c2d8709bf1f8fa6e6d8350dcea63f1a9b3e8':
Revert "Include vendor partitions in target zip generation"
Change-Id: I76559ad1211a38eecd7b15ec1a4b5ca5bd3f6914
Tao Bao [Wed, 11 May 2016 15:11:56 +0000 (15:11 +0000)]
Merge "Revert "Include vendor partitions in target zip generation""
Wei Wang [Wed, 11 May 2016 14:49:50 +0000 (14:49 +0000)]
Revert "Include vendor partitions in target zip generation"
This reverts commit
421fe44ae8e90a85b7f60ee6942687a51771b8b5.
Change-Id: Id45781de73735783bc7dfb6fc2838957578d00d3
Dan Willemsen [Wed, 11 May 2016 07:23:38 +0000 (00:23 -0700)]
Use product-specific Soong outputs
This way, when switching between two products, we don't need to re-run
kati.
Change-Id: I0a8b3b49f1b76d9e120ea93bb5d2aa06cd189679
Ian Rogers [Tue, 10 May 2016 19:06:01 +0000 (12:06 -0700)]
Add code search links to warnings.
Add argument parsing using the argparse library.
Make HTML easier to read by adding a \n after each table row.
Change-Id: I6b745fc60afb96fb51e5f69df7d607b5fb8da0e5
Wei Wang [Wed, 11 May 2016 02:24:24 +0000 (02:24 +0000)]
Merge "Include vendor partitions in target zip generation"
am:
bb05fd768c
* commit '
bb05fd768c49273a6cdf49eb2889c608b36ba41d':
Include vendor partitions in target zip generation
Change-Id: Ib46cc59880ae1b30f97c98b8d2abbefcd0851a7e
Treehugger Robot [Wed, 11 May 2016 02:18:58 +0000 (02:18 +0000)]
Merge "Include vendor partitions in target zip generation"
Dan Willemsen [Wed, 11 May 2016 00:46:42 +0000 (00:46 +0000)]
Merge "Add a 32-bit x86_64 arch variant"
am:
19b7692496
* commit '
19b76924969de45f77334a5e7d86b22362a8d845':
Add a 32-bit x86_64 arch variant
Change-Id: Ia2d708a0d2159d39cafbbf9589e2c4d296e3ffb1
Dan Willemsen [Wed, 11 May 2016 00:35:59 +0000 (00:35 +0000)]
Merge "Add a 32-bit x86_64 arch variant"
Dan Willemsen [Tue, 10 May 2016 23:39:55 +0000 (23:39 +0000)]
Merge "Do not apply -Wl,--fix-cortex-a8 to Cortex-A9"
am:
3027e5fca9
* commit '
3027e5fca982bc64e66366a2cbe965238536a395':
Do not apply -Wl,--fix-cortex-a8 to Cortex-A9
Change-Id: I14eaefd54c3beebe3fe8c948fe22dce5de2c42f5
Treehugger Robot [Tue, 10 May 2016 23:34:01 +0000 (23:34 +0000)]
Merge "Do not apply -Wl,--fix-cortex-a8 to Cortex-A9"
Dan Willemsen [Tue, 10 May 2016 21:54:08 +0000 (14:54 -0700)]
Do not apply -Wl,--fix-cortex-a8 to Cortex-A9
Change-Id: I11d380163423cb4aa0fee60ecbaa1e38fa5143a1
Ian Rogers [Tue, 10 May 2016 22:11:37 +0000 (22:11 +0000)]
Merge "Add error prone patterns to warn.py"
am:
620cbb1652
* commit '
620cbb165243f764435cea8ba57786c6c627c600':
Add error prone patterns to warn.py
Change-Id: I0aebf407151acf8389eb0947895a3c0d2d53c189
Ian Rogers [Tue, 10 May 2016 22:03:23 +0000 (22:03 +0000)]
Merge "Add error prone patterns to warn.py"
Dan Willemsen [Tue, 10 May 2016 21:08:45 +0000 (14:08 -0700)]
Add a 32-bit x86_64 arch variant
The current 32-bit configuration for generic x86_64 targets inherits some
variables (SSE4 support) from the 64-bit configuration, and overrides
the make variables used for other configurations (SSSE3). Ideally, these
would be using different variables, but until then, unify the
configuration for x86_64 targets so that everything is consistent.
Bug:
28694691
Change-Id: I47e67299d4c632e7491d7e73dc0fc6480ef08006
Ian Rogers [Tue, 10 May 2016 06:19:42 +0000 (23:19 -0700)]
Add error prone patterns to warn.py
Bug:
28681096
(cherry picked from commit
df79adacaba2d8aebadea2cc638adbe4fd6074bb)
Change-Id: I06ac0ed4593b03cea0a8163ca85e393ff1358855
Alex Klyubin [Tue, 10 May 2016 19:19:51 +0000 (19:19 +0000)]
Merge "ApkSignerEngine abstraction for apksigner-core library."
am:
afd3d55261
* commit '
afd3d55261df842767eca58afc55a241e71c0975':
ApkSignerEngine abstraction for apksigner-core library.
Change-Id: Iac53d76ce67882ae73842d9ecb182ea21fb81f70
Treehugger Robot [Tue, 10 May 2016 19:13:41 +0000 (19:13 +0000)]
Merge "ApkSignerEngine abstraction for apksigner-core library."
Wei Wang [Tue, 10 May 2016 05:24:50 +0000 (22:24 -0700)]
Include 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.
BUG:
28623063
Change-Id: I6e0969c31c9ad2e8285c6f560825c160aa8c4d55
Ian Rogers [Tue, 10 May 2016 17:43:58 +0000 (17:43 +0000)]
Merge "Sort warnings with most frequent first."
am:
2e1409538c
* commit '
2e1409538c0b663459a740b815279ecbdb31a682':
Sort warnings with most frequent first.
Change-Id: Ie4787ec98bc03671db36c83bcd324d7cc03df800
Ian Rogers [Tue, 10 May 2016 17:38:15 +0000 (17:38 +0000)]
Merge "Sort warnings with most frequent first."
Ian Rogers [Tue, 10 May 2016 16:34:29 +0000 (09:34 -0700)]
Sort warnings with most frequent first.
Change-Id: Id608c20d065bec83dcb2993658cc743d5e9dcb46
Dan Willemsen [Mon, 9 May 2016 23:51:44 +0000 (23:51 +0000)]
Merge "Fix build system documentation example"
am:
af14b921af
* commit '
af14b921afc607200c086d0326ae4cb11bbd0545':
Fix build system documentation example
Change-Id: I95d39419f861d72ceb3ce669e289b4396d8a9dec
Dan Willemsen [Mon, 9 May 2016 23:37:44 +0000 (23:37 +0000)]
Merge "Fix build system documentation example"
Dan Willemsen [Mon, 9 May 2016 22:55:33 +0000 (22:55 +0000)]
Merge "Remove -mcpu=cortex-a15 when adding -mcpu=krait"
am:
f948dddfe0
* commit '
f948dddfe085554b6dbdd0271170d53c09bbb7cd':
Remove -mcpu=cortex-a15 when adding -mcpu=krait
Change-Id: Iff13b081842522217be92ca9fdf725a6a793412a
Treehugger Robot [Mon, 9 May 2016 22:43:08 +0000 (22:43 +0000)]
Merge "Remove -mcpu=cortex-a15 when adding -mcpu=krait"
Dan Willemsen [Mon, 9 May 2016 22:27:50 +0000 (22:27 +0000)]
Merge "Revert "[MIPS] Temporarily disable Mips shared-textrel errors""
am:
136fa4377d
* commit '
136fa4377d230ba9c7a53b998ac708a98c0d16c2':
Revert "[MIPS] Temporarily disable Mips shared-textrel errors"
Change-Id: Ie2f2c6581f518c010454b32016cce31efc85ab19
Dan Willemsen [Mon, 9 May 2016 22:09:42 +0000 (22:09 +0000)]
Merge "Revert "[MIPS] Temporarily disable Mips shared-textrel errors""
Dan Willemsen [Mon, 9 May 2016 21:53:22 +0000 (14:53 -0700)]
Remove -mcpu=cortex-a15 when adding -mcpu=krait
This is not necessary, since the later -mcpu=krait will override the
earlier -mcpu=cortex-a15, but is cleaner (and matches Soong).
Change-Id: I18301faf8a5cb5364617b3008bc8af461b7884f8
Alex Klyubin [Mon, 9 May 2016 20:21:52 +0000 (20:21 +0000)]
Merge "APK Signature Scheme v2 signing logic for apksigner-core."
am:
2627b4199f
* commit '
2627b4199f539e62a2c96c6c445b187df2177d9b':
APK Signature Scheme v2 signing logic for apksigner-core.
Change-Id: Id8be4e6625d0dd6378839018597de2c1e6c7e898
Alex Klyubin [Thu, 5 May 2016 21:42:53 +0000 (14:42 -0700)]
ApkSignerEngine abstraction for apksigner-core library.
This adds the ApkSignerEngine abstraction to the apksigner-core
library. This abstraction enables the separation of
parsing/building/writing of an APK from signing the APK.
Users of ApkSignerEngine invoke it during specific I/O events (e.g.,
JAR entry encountered in input APK, all output JAR entries ready).
The engine responds by occasionally providing instructions about what
to do next. For example, it may provide JAR entries to be added to
the output APK, thus making the output APK signed.
The default implementation of ApkSignerEngine will be provided in a
follow-up commit.
Bug:
26516150
Bug:
27461702
Change-Id: Ia85fd09497a6e2ff3103ba10c53a1848ba731f7b
Treehugger Robot [Mon, 9 May 2016 20:12:14 +0000 (20:12 +0000)]
Merge "APK Signature Scheme v2 signing logic for apksigner-core."
Dan Willemsen [Mon, 9 May 2016 20:10:00 +0000 (13:10 -0700)]
Revert "[MIPS] Temporarily disable Mips shared-textrel errors"
This reverts commit
3dfd20aea49cf6ff75aa41e337ae8dd9817e6428 - the clang
version we are using has the mentioned permanent fix. The new build
system (Soong) uses a single list of unknown clang flags for all
architectures, so workarounds like this no longer work.
Change-Id: I64a83f3b52a9ca1d11a76df5a060a36f42e27e4b
Alex Klyubin [Thu, 5 May 2016 23:13:23 +0000 (16:13 -0700)]
APK Signature Scheme v2 signing logic for apksigner-core.
apksigner-code library will offer a high-level primitive (future
commit) for signing APKs. This is meant to be used by
build/tools/signapk and Android Studio's APK builder/signer.
This commit adds a lower-level APK Signature Scheme v2 (aka v2
signing) code which will be used by the future APK signing abstraction
exposed by this library.
All classes (except DataSource and DataSources) added by this commit
are internal (i.e., implementation details of this library). Clients
of this library should not be using these classes.
Bug:
26516150
Change-Id: I98d4da0666cf122667c67565108ea4fb28ac51e6
Dan Willemsen [Mon, 9 May 2016 04:48:38 +0000 (04:48 +0000)]
Merge "Remove arm-specific -Wno-psabi"
am:
ce9b6cab53
* commit '
ce9b6cab532c823cd452450d2ac06751f70e0a15':
Remove arm-specific -Wno-psabi
Change-Id: If809176c0a4b7191bc75bd9ad05c37f3a0d0601f
Dan Willemsen [Mon, 9 May 2016 04:43:42 +0000 (04:43 +0000)]
Merge "Remove arm-specific -Wno-psabi"
Dan Willemsen [Mon, 9 May 2016 02:23:01 +0000 (19:23 -0700)]
Fix build system documentation example
The input and output file paths were mixed up in this example. Properly
indicate the input file as a dependency.
Change-Id: I71271025c6ce3ef8f82b10aee91fc0c7ae8f2399
Dan Willemsen [Fri, 6 May 2016 22:50:19 +0000 (15:50 -0700)]
Remove arm-specific -Wno-psabi
This flag was added to stop a GCC 4.4 specific warning. Since we've
upgraded, this flag is no longer necessary. It's already stripped for
clang builds, and I found no instances in the logs after removing it.
Change-Id: If5316d2eb8066dc43d7af7aebc7e4920b4ada192
Ying Wang [Fri, 6 May 2016 20:29:14 +0000 (20:29 +0000)]
Merge "Harden dependency on generated sources."
am:
622b3c2764
* commit '
622b3c27642fb8612d1c39e41d17941ca265b8c7':
Harden dependency on generated sources.
Change-Id: I122feceab132d46bf0fe27c91ffbd331a9e84731
Alistair Strachan [Fri, 6 May 2016 20:19:42 +0000 (20:19 +0000)]
Merge "Avoid accidentally using the host\'s native \'as\' command."
am:
e6710e9b90
* commit '
e6710e9b9065765645c72e15cb8953a34aab83dc':
Avoid accidentally using the host's native 'as' command.
Change-Id: I66dc6048fc45ad6763b63e55ad2eb6e0d71a14ac
Treehugger Robot [Fri, 6 May 2016 20:16:40 +0000 (20:16 +0000)]
Merge "Harden dependency on generated sources."
Elliott Hughes [Fri, 6 May 2016 20:11:45 +0000 (20:11 +0000)]
Merge "Avoid accidentally using the host's native 'as' command."
Ying Wang [Fri, 6 May 2016 03:02:08 +0000 (20:02 -0700)]
Harden dependency on generated sources.
Previously if a library has custom generated headers in
LOCAL_GENERATED_SOURCES and export its include path with
LOCAL_EXPORT_C_INCLUDE_DIRS, there is almost no way for the users of the
library to set up dependency of their object files on the generated
headers.
This change makes the generated sources dependency of the library's
export_includes, which is guaranteed generated before client code gets
compiled.
Also we added proto-generated cpp files to my_generated_sources so that
we can deal solely with $(my_generated_sources). Because many
Android.mks assume the generted .pb.hs are in $(generated_sources_dir)
instead of $(intermediates), we have to generate the source files in
$(generated_sources_dir) and make a copy in $(intermediates).
Bug:
28622149
Change-Id: I73b21443fa706f3735faf16356ed8c08fbfecca6
Dan Willemsen [Fri, 6 May 2016 01:23:43 +0000 (01:23 +0000)]
Merge "Only pass NINJA_ARGS to the main ninja compile"
am:
374c7facd5
* commit '
374c7facd565b4d896db20ee04c94e90dee4c8e7':
Only pass NINJA_ARGS to the main ninja compile
Change-Id: I98f588bf7d9c39bf2a9ac7c07bfb15f19299694d
Treehugger Robot [Fri, 6 May 2016 01:11:39 +0000 (01:11 +0000)]
Merge "Only pass NINJA_ARGS to the main ninja compile"
Dan Willemsen [Thu, 5 May 2016 23:52:37 +0000 (16:52 -0700)]
Only pass NINJA_ARGS to the main ninja compile
This way commands like "-t query <target>" will work against the main
build, instead of failing to find the target during the initial soong
build and stopping.
Change-Id: I9b6bd6ac431b95e12db69ec7f272669b9d292761
Colin Cross [Thu, 5 May 2016 21:43:01 +0000 (14:43 -0700)]
Default USE_SOONG to true
Change-Id: Iad88aed4060b84aef2381f6300f16bad14f3a6ca
Alistair Strachan [Thu, 5 May 2016 23:29:08 +0000 (16:29 -0700)]
Avoid accidentally using the host's native 'as' command.
When invoking clang for the host to assemble .S files, the -B flag
would not be provided, which allowed the host prebuilt clang to
use an 'as' from the native environment. Most of the time this
"just works", but some newer 'as' versions cause problems with
the older prebuilt toolchain, for example by generating
unsupported relocation types.
To avoid this problem, simply use the -B flag to tell clang to
invoke the assembler from the correct prebuilt gcc prefix.
Change-Id: I18ea4f37ae637b652cfd7321c41929f8be075342
Signed-off-by: Alistair Strachan <alistair.strachan@imgtec.com>
Alex Klyubin [Thu, 5 May 2016 22:55:22 +0000 (22:55 +0000)]
Merge "JAR signing logic for the apksigner-core library."
am:
b60b340597
* commit '
b60b340597ab4d1058b2a676e619531d2c829e40':
JAR signing logic for the apksigner-core library.
Change-Id: Ie90f89c7276839bda3e5e3246807d6cd18397d74
Treehugger Robot [Thu, 5 May 2016 22:42:43 +0000 (22:42 +0000)]
Merge "JAR signing logic for the apksigner-core library."
Alex Klyubin [Thu, 5 May 2016 19:51:56 +0000 (19:51 +0000)]
Merge "SHA-256 with ECDSA supported only on API Level 21 and higher."
am:
33d34ae236
* commit '
33d34ae236e487b04696d913d2b327d4c3b8c251':
SHA-256 with ECDSA supported only on API Level 21 and higher.
Change-Id: I0253d5ff12e735ba3ed0900ef8577662253de17b
Alex Klyubin [Thu, 5 May 2016 19:43:53 +0000 (19:43 +0000)]
Merge "SHA-256 with ECDSA supported only on API Level 21 and higher."
Colin Cross [Thu, 5 May 2016 19:03:07 +0000 (19:03 +0000)]
Merge "Update prebuilt build tools path"
am:
405b73ea10
* commit '
405b73ea10cbe4a4d47c300643171df8f5569665':
Update prebuilt build tools path
Change-Id: I4bb1ab3f85f9f30fcb326b856cc96fe9f51c4926
Colin Cross [Thu, 5 May 2016 18:54:37 +0000 (18:54 +0000)]
Merge "Update prebuilt build tools path"
Alex Klyubin [Thu, 5 May 2016 17:50:24 +0000 (10:50 -0700)]
JAR signing logic for the apksigner-core library.
apksigner-code library will offer a high-level primitive (future
commit) for signing APKs. This is meant to be used by
build/tools/signapk and Android Studio's APK builder/signer.
This commit adds a lower-level JAR signing (aka v1 signing) code which
will be used by the future APK signing abstraction exposed by this
library.
All classes added by this commit are internal (i.e., implementation
details of this library). Clients of this library should not be using
these classes.
Bug:
26516150
Change-Id: I5cecd435e63aab206d63868be5e0d0e289e7c423
Colin Cross [Wed, 4 May 2016 23:38:20 +0000 (23:38 +0000)]
Merge "Pass SANTIIZE_HOST and SANITIZE_TARGET to soong"
am:
c9778e339d
* commit '
c9778e339d936be09f4415413538617c64734967':
Pass SANTIIZE_HOST and SANITIZE_TARGET to soong
Change-Id: I920a8fec171324d4077eb60ad8f812227893e917
Colin Cross [Wed, 4 May 2016 23:34:53 +0000 (23:34 +0000)]
Merge "Pass SANTIIZE_HOST and SANITIZE_TARGET to soong"
Colin Cross [Tue, 19 Apr 2016 22:32:22 +0000 (15:32 -0700)]
Update prebuilt build tools path
Build tools have been moved from prebuilts/sdk/tools to
prebuilts/build-tools.
Bug:
27857138
Change-Id: I60be42c197d420897dab77808c25818c9d2e81df