OSDN Git Service
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
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
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
Stephen Hines [Wed, 4 May 2016 21:25:18 +0000 (21:25 +0000)]
Merge "Update RS to use latest Clang-
2812033 prebuilts as well."
am:
fa4ff9defd
* commit '
fa4ff9defd768b43a030939cd4dc28ed281ae8b7':
Update RS to use latest Clang-
2812033 prebuilts as well.
Change-Id: Ic85416306e3f41b26c130b04125437ebccf8af5c
Pirama Arumuga Nainar [Wed, 4 May 2016 21:00:07 +0000 (21:00 +0000)]
Merge "Update RS to use latest Clang-
2812033 prebuilts as well."
Alex Klyubin [Wed, 4 May 2016 01:12:45 +0000 (18:12 -0700)]
SHA-256 with ECDSA supported only on API Level 21 and higher.
Turns out APK signatures using SHA-256 with ECDSA are accepted only by
platforms with API Level 21 and higher, not 18 and higher.
Bug:
28296599
Change-Id: I3fab5be17bf3a9bdbf4d84d90d51448027c7e761
Colin Cross [Tue, 3 May 2016 21:17:25 +0000 (21:17 +0000)]
Merge "Update path to reverse_path.py"
am:
2614bdb876
* commit '
2614bdb876e9a6bd732d41679b91ec9627c57e34':
Update path to reverse_path.py
Change-Id: I0d7f47ee3ca4d6ac143b2c580337c74fa053f09e
Colin Cross [Tue, 3 May 2016 21:13:22 +0000 (21:13 +0000)]
Merge "Update path to reverse_path.py"
Alex Klyubin [Tue, 3 May 2016 20:57:58 +0000 (20:57 +0000)]
Merge "Separate logic for alg selection for OTA and APK signing."
am:
cc3440cc1d
* commit '
cc3440cc1d101c225cbe2a42fe4046d3a44b3927':
Separate logic for alg selection for OTA and APK signing.
Change-Id: Iaed58ff5398ac0637129b3f45eb3a1226e891226
Alex Klyubin [Tue, 3 May 2016 20:50:54 +0000 (20:50 +0000)]
Merge "Separate logic for alg selection for OTA and APK signing."
Colin Cross [Mon, 2 May 2016 22:31:17 +0000 (15:31 -0700)]
Update path to reverse_path.py
Change-Id: I98902e94a99fae7f9e738a872a83acb98d32c781
Igor Murashkin [Mon, 2 May 2016 20:55:54 +0000 (20:55 +0000)]
Merge "old-cts: Add testng and libcoreoj test support"
am:
11821a1e1e
* commit '
11821a1e1e1360ceb1ad83f55715d7415c385633':
old-cts: Add testng and libcoreoj test support
Change-Id: I0f838aebab9aea750217e9351e03f19410ba049c
Igor Murashkin [Mon, 2 May 2016 20:40:09 +0000 (20:40 +0000)]
Merge "old-cts: Add testng and libcoreoj test support"
Shinichiro Hamaji [Mon, 2 May 2016 19:10:43 +0000 (19:10 +0000)]
Merge "Initialize an uninitialized field in ijar"
am:
a6da20e2d2
* commit '
a6da20e2d29b3bbde0b1b9101727cd6ea8b9c9c4':
Initialize an uninitialized field in ijar
Change-Id: Iee38d8d3eb2ff20d8e4d1cf876e83bfdac5e3391
Shinichiro Hamaji [Mon, 2 May 2016 19:00:42 +0000 (19:00 +0000)]
Merge "Initialize an uninitialized field in ijar"
Chih-Hung Hsieh [Mon, 2 May 2016 18:27:24 +0000 (18:27 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
169cb4b68c
* commit '
169cb4b68c6e69e1997cc5e2f9e555b010127bb5':
Fix google-explicit-constructor warnings.
Change-Id: Iafe8e50822c55d80227745f4823b5cbe97039944
Shinichiro Hamaji [Mon, 2 May 2016 18:19:23 +0000 (03:19 +0900)]
Initialize an uninitialized field in ijar
The upstream patch was merged:
https://github.com/bazelbuild/bazel/commit/
a5004430338bc72817c7
Bug:
28347190
Change-Id: I9b8b9bc830bd16299b94e8c92c22dba8aa36affb
Chih-hung Hsieh [Mon, 2 May 2016 18:08:16 +0000 (18:08 +0000)]
Merge "Fix google-explicit-constructor warnings."
Chih-Hung Hsieh [Sat, 30 Apr 2016 00:44:49 +0000 (00:44 +0000)]
Merge "Suppress google-* checks in vendor modules."
am:
f2592e192d
* commit '
f2592e192da6fcea5233b073149751c9ee687ab9':
Suppress google-* checks in vendor modules.
Change-Id: Id501346744dd238120c428cdf5ebb9815a438bd2
Chih-hung Hsieh [Sat, 30 Apr 2016 00:38:35 +0000 (00:38 +0000)]
Merge "Suppress google-* checks in vendor modules."
Stephen Hines [Fri, 29 Apr 2016 23:50:48 +0000 (16:50 -0700)]
Update RS to use latest Clang-
2812033 prebuilts as well.
Change-Id: I62e294e2b8c882c235a6ac7518fa352acd46e055
Chih-Hung Hsieh [Fri, 29 Apr 2016 22:16:59 +0000 (15:16 -0700)]
Suppress google-* checks in vendor modules.
Too many warnings in vendor code that we cannot fix yet.
Bug: http://b/
27779618
Change-Id: I8b65b1fd55c4e4d0dadf0617ab25962809237309
Chih-Hung Hsieh [Fri, 29 Apr 2016 21:10:10 +0000 (14:10 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: I72bdd1df09cea91743aa89dab4cb0b9db2657e2d
Alex Klyubin [Fri, 29 Apr 2016 20:32:47 +0000 (20:32 +0000)]
Merge "zipalign supports -p also when checking alignment."
am:
401f8b953f
* commit '
401f8b953fff2f510ef7c118cfef503981ab5be6':
zipalign supports -p also when checking alignment.
Change-Id: I54d1a931f108ab80fafaf3f13a34d924175eb3a9
Alex Klyubin [Fri, 29 Apr 2016 20:26:17 +0000 (20:26 +0000)]
Merge "zipalign supports -p also when checking alignment."
Alex Klyubin [Fri, 29 Apr 2016 19:32:17 +0000 (12:32 -0700)]
zipalign supports -p also when checking alignment.
This updates the usage banner of zipalign to state that the -p switch
is supported in check alignment mode.
Change-Id: I119026b0e09e5a2528646e88a9b58dbb79c0c17c
Stephen Hines [Wed, 27 Apr 2016 22:46:07 +0000 (22:46 +0000)]
Merge "Switch to clang-
2812033."
am:
fb737e9
* commit '
fb737e9002f43d68473b68518808aab99da9abcf':
Switch to clang-
2812033.
Change-Id: Iffedb14b2c2f2da4d690336f5fa2122dea2e1c83
Stephen Hines [Wed, 27 Apr 2016 22:33:05 +0000 (22:33 +0000)]
Merge "Switch to clang-
2812033."
Yabin Cui [Wed, 27 Apr 2016 19:22:15 +0000 (19:22 +0000)]
Merge "Use strip mode mini-debug-info by default except on mips."
am:
e13b4c6
* commit '
e13b4c61bd1d6b0d57d7840607d39cc59fa0d840':
Use strip mode mini-debug-info by default except on mips.
Change-Id: Ia3de2e088b87b71d21b52c358ae5c45564a73bda
Yabin Cui [Wed, 27 Apr 2016 19:19:06 +0000 (19:19 +0000)]
Merge "Use strip mode mini-debug-info by default except on mips."
Ying Wang [Wed, 27 Apr 2016 16:59:13 +0000 (16:59 +0000)]
Merge "Warn if there is file with unknown suffix in Java module\'s sources."
am:
85b9117
* commit '
85b911719084b7266de459408e8f038a2a429e0c':
Warn if there is file with unknown suffix in Java module's sources.
Change-Id: I6c7d7a6b51f63f9b6f0da8b6e35d73d46820cae4
Ying Wang [Wed, 27 Apr 2016 16:49:10 +0000 (16:49 +0000)]
Merge "Warn if there is file with unknown suffix in Java module's sources."
Yabin Cui [Tue, 26 Apr 2016 23:08:00 +0000 (16:08 -0700)]
Use strip mode mini-debug-info by default except on mips.
Bug:
27923447
Change-Id: I818dea44f126155b4b9b3cd929823d8eda1a1174
Igor Murashkin [Wed, 27 Apr 2016 00:00:22 +0000 (17:00 -0700)]
old-cts: Add testng and libcoreoj test support
Bug:
27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32707
Ying Wang [Tue, 26 Apr 2016 22:49:56 +0000 (15:49 -0700)]
Warn if there is file with unknown suffix in Java module's sources.
This helps catch extra ) at the end of LOCAL_SRC_FILES.
Bug:
28389144
Change-Id: I0ab536b5bb47338ebf5bdf531835d58f527ccf67
Stefan Stanacar [Tue, 26 Apr 2016 22:27:30 +0000 (22:27 +0000)]
Merge "ccache: Allow external setting of CCACHE_COMPILERCHECK variable"
am:
a48eb99
* commit '
a48eb99f41c33eb205b3c4e860d82b5d523ba84b':
ccache: Allow external setting of CCACHE_COMPILERCHECK variable
Change-Id: I02bee522220775c5c8e781f1ef2f45a86e2451ba
Mohammed Habibulla [Tue, 26 Apr 2016 22:14:17 +0000 (22:14 +0000)]
Merge "ccache: Allow external setting of CCACHE_COMPILERCHECK variable"
Stephen Hines [Tue, 26 Apr 2016 21:34:24 +0000 (14:34 -0700)]
Switch to clang-
2812033.
Bug: http://b/
25291096
Change-Id: I630b7e8a682e3c3b82ad9837b664c1155497618f
Chih-Hung Hsieh [Tue, 26 Apr 2016 01:48:11 +0000 (01:48 +0000)]
Merge "Add tidy.mk to set up global default checks."
am:
214c7fa
* commit '
214c7fadf16b458c0eaa0db1d875ca92b8c0a609':
Add tidy.mk to set up global default checks.
Change-Id: I27a84cab03ff208875014e852f2699d4449d30fd
Chih-hung Hsieh [Tue, 26 Apr 2016 01:41:42 +0000 (01:41 +0000)]
Merge "Add tidy.mk to set up global default checks."
Tao Bao [Mon, 25 Apr 2016 19:17:42 +0000 (19:17 +0000)]
Merge "target_files_diff: Fix the issue with file type change."
am:
23995fe
* commit '
23995fe30f033c42e5274a4cdcbdc710ac3af635':
target_files_diff: Fix the issue with file type change.
Change-Id: Icde8bad6c81ee9c179434010e1d17587fd5386a1
Chih-Hung Hsieh [Thu, 21 Apr 2016 22:37:24 +0000 (15:37 -0700)]
Add tidy.mk to set up global default checks.
* Default checks include only google* minus google-readability*.
* Some google-* checks are disabled for external projects.
* Each project can add more or disable checks through LOCAL_TIDY_CHECKS.
Bug: http://b/
27779618
Change-Id: I83eed73bd2bddaace565a6dde532fb2036b4fac4
Treehugger Robot [Mon, 25 Apr 2016 19:08:53 +0000 (19:08 +0000)]
Merge "target_files_diff: Fix the issue with file type change."
Tao Bao [Mon, 25 Apr 2016 17:03:38 +0000 (10:03 -0700)]
target_files_diff: Fix the issue with file type change.
When a file is switched from a regular file to a symlink, we should skip
the comparasion.
Bug:
28373409
Change-Id: I8fef00ab9f2d6f811fde1cadf595e8bd46af2dfd
(cherry picked from commit
f31a6deeeeb896cc516c2f2f91ceff1fd0702938)
Alex Klyubin [Mon, 25 Apr 2016 18:07:03 +0000 (11:07 -0700)]
Separate logic for alg selection for OTA and APK signing.
The rules for which digest algorithms are accepted by the Android
platform for APK signatures and OTA update package signatures are
different. For example, the set of digest algorithms accepted for APK
signatures depends on the signing key algorithm and the platform's
API Level. Whereas the set of digest algorithms accepted for OTA
update package signatures by Recovery depends on the list produced
by the build system, which in turn produces the list based on the
key algorithm and digest used in the signing certificate.
To reflect this reality, this refactoring CL explicitly separates
signapk's logic for choosing the digest algorithm to use for v1
signing from its logic for choosing the digest algorithm to use for
OTA update package signing.
Bug:
28296599
Change-Id: Ic7aa77e89622d727e985f8749071284746be7f45
Marie Janssen [Mon, 25 Apr 2016 14:59:11 +0000 (14:59 +0000)]
Merge "make croot slightly more useful"
am:
9d868c0
* commit '
9d868c0800eef398f8d02c13555aa85cf0f8357b':
make croot slightly more useful
Change-Id: I04bb6e11ee9a0797ccdc180529c6ce7b0851ee1c
Marie Janssen [Mon, 25 Apr 2016 14:54:44 +0000 (14:54 +0000)]
Merge "make croot slightly more useful"
Marie Janssen [Thu, 21 Apr 2016 23:53:39 +0000 (16:53 -0700)]
make croot slightly more useful
Have croot take an argument of a directory to end up in,
so we can jump around the tree even faster.
Change-Id: Ieb6a8d47fee0412006a11192b29ed44604961312