Commit Graph

26992 Commits

Author SHA1 Message Date
Ying Wang e6b72b3636 Merge "Harden dependency on generated sources."
am: 622b3c2764

* commit '622b3c27642fb8612d1c39e41d17941ca265b8c7':
  Harden dependency on generated sources.

Change-Id: I122feceab132d46bf0fe27c91ffbd331a9e84731
2016-05-06 20:29:14 +00:00
Alistair Strachan 09dc0d4f76 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
2016-05-06 20:19:42 +00:00
Treehugger Robot 622b3c2764 Merge "Harden dependency on generated sources." 2016-05-06 20:16:41 +00:00
Elliott Hughes e6710e9b90 Merge "Avoid accidentally using the host's native 'as' command." 2016-05-06 20:11:45 +00:00
Ying Wang 05f9f35836 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
2016-05-06 10:20:17 -07:00
Dan Willemsen 667a5fe33b 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
2016-05-06 01:23:43 +00:00
Treehugger Robot 374c7facd5 Merge "Only pass NINJA_ARGS to the main ninja compile" 2016-05-06 01:11:39 +00:00
Dan Willemsen 9a97ba700b 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
2016-05-05 16:55:21 -07:00
Alistair Strachan 5ff9c81b6c 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>
2016-05-05 16:29:08 -07:00
Alex Klyubin b0c9166c04 Merge "JAR signing logic for the apksigner-core library."
am: b60b340597

* commit 'b60b340597ab4d1058b2a676e619531d2c829e40':
  JAR signing logic for the apksigner-core library.

Change-Id: Ie90f89c7276839bda3e5e3246807d6cd18397d74
2016-05-05 22:55:22 +00:00
Treehugger Robot b60b340597 Merge "JAR signing logic for the apksigner-core library." 2016-05-05 22:42:43 +00:00
Alex Klyubin 5536a1bced 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
2016-05-05 19:51:56 +00:00
Alex Klyubin 33d34ae236 Merge "SHA-256 with ECDSA supported only on API Level 21 and higher." 2016-05-05 19:43:54 +00:00
Colin Cross f51ed4020f Merge "Update prebuilt build tools path"
am: 405b73ea10

* commit '405b73ea10cbe4a4d47c300643171df8f5569665':
  Update prebuilt build tools path

Change-Id: I4bb1ab3f85f9f30fcb326b856cc96fe9f51c4926
2016-05-05 19:03:07 +00:00
Colin Cross 405b73ea10 Merge "Update prebuilt build tools path" 2016-05-05 18:54:37 +00:00
Alex Klyubin 85b8a0146e 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
2016-05-05 10:53:56 -07:00
Colin Cross 0206533827 Merge "Pass SANTIIZE_HOST and SANITIZE_TARGET to soong"
am: c9778e339d

* commit 'c9778e339d936be09f4415413538617c64734967':
  Pass SANTIIZE_HOST and SANITIZE_TARGET to soong

Change-Id: I920a8fec171324d4077eb60ad8f812227893e917
2016-05-04 23:38:20 +00:00
Colin Cross c9778e339d Merge "Pass SANTIIZE_HOST and SANITIZE_TARGET to soong" 2016-05-04 23:34:54 +00:00
Colin Cross facdca17d5 Update prebuilt build tools path
Build tools have been moved from prebuilts/sdk/tools to
prebuilts/build-tools.

Bug: 27857138
Change-Id: I60be42c197d420897dab77808c25818c9d2e81df
2016-05-04 16:02:02 -07:00
Stephen Hines b2616db449 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
2016-05-04 21:25:18 +00:00
Pirama Arumuga Nainar fa4ff9defd Merge "Update RS to use latest Clang-2812033 prebuilts as well." 2016-05-04 21:00:07 +00:00
Alex Klyubin b141ded82b 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
2016-05-03 18:15:39 -07:00
Colin Cross ca3b61038c Merge "Update path to reverse_path.py"
am: 2614bdb876

* commit '2614bdb876e9a6bd732d41679b91ec9627c57e34':
  Update path to reverse_path.py

Change-Id: I0d7f47ee3ca4d6ac143b2c580337c74fa053f09e
2016-05-03 21:17:25 +00:00
Colin Cross 2614bdb876 Merge "Update path to reverse_path.py" 2016-05-03 21:13:22 +00:00
Alex Klyubin 459b93d6f8 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
2016-05-03 20:57:58 +00:00
Alex Klyubin cc3440cc1d Merge "Separate logic for alg selection for OTA and APK signing." 2016-05-03 20:50:54 +00:00
Colin Cross 367ab2989a Update path to reverse_path.py
Change-Id: I98902e94a99fae7f9e738a872a83acb98d32c781
2016-05-02 15:31:17 -07:00
Igor Murashkin d581330855 Merge "old-cts: Add testng and libcoreoj test support"
am: 11821a1e1e

* commit '11821a1e1e1360ceb1ad83f55715d7415c385633':
  old-cts: Add testng and libcoreoj test support

Change-Id: I0f838aebab9aea750217e9351e03f19410ba049c
2016-05-02 20:55:54 +00:00
Igor Murashkin 11821a1e1e Merge "old-cts: Add testng and libcoreoj test support" 2016-05-02 20:40:09 +00:00
Shinichiro Hamaji c6a3413fa7 Merge "Initialize an uninitialized field in ijar"
am: a6da20e2d2

* commit 'a6da20e2d29b3bbde0b1b9101727cd6ea8b9c9c4':
  Initialize an uninitialized field in ijar

Change-Id: Iee38d8d3eb2ff20d8e4d1cf876e83bfdac5e3391
2016-05-02 19:10:43 +00:00
Shinichiro Hamaji a6da20e2d2 Merge "Initialize an uninitialized field in ijar" 2016-05-02 19:00:43 +00:00
Chih-Hung Hsieh 6b63c3b696 Merge "Fix google-explicit-constructor warnings."
am: 169cb4b68c

* commit '169cb4b68c6e69e1997cc5e2f9e555b010127bb5':
  Fix google-explicit-constructor warnings.

Change-Id: Iafe8e50822c55d80227745f4823b5cbe97039944
2016-05-02 18:27:24 +00:00
Shinichiro Hamaji d6c694b302 Initialize an uninitialized field in ijar
The upstream patch was merged:
https://github.com/bazelbuild/bazel/commit/a5004430338bc72817c7

Bug: 28347190
Change-Id: I9b8b9bc830bd16299b94e8c92c22dba8aa36affb
2016-05-03 03:19:23 +09:00
Chih-hung Hsieh 169cb4b68c Merge "Fix google-explicit-constructor warnings." 2016-05-02 18:08:16 +00:00
Chih-Hung Hsieh 336e44fc3f Merge "Suppress google-* checks in vendor modules."
am: f2592e192d

* commit 'f2592e192da6fcea5233b073149751c9ee687ab9':
  Suppress google-* checks in vendor modules.

Change-Id: Id501346744dd238120c428cdf5ebb9815a438bd2
2016-04-30 00:44:49 +00:00
Chih-hung Hsieh f2592e192d Merge "Suppress google-* checks in vendor modules." 2016-04-30 00:38:35 +00:00
Stephen Hines 348b81a404 Update RS to use latest Clang-2812033 prebuilts as well.
Change-Id: I62e294e2b8c882c235a6ac7518fa352acd46e055
2016-04-29 16:50:48 -07:00
Chih-Hung Hsieh 30f86e4ab8 Suppress google-* checks in vendor modules.
Too many warnings in vendor code that we cannot fix yet.

Bug: http://b/27779618
Change-Id: I8b65b1fd55c4e4d0dadf0617ab25962809237309
2016-04-29 15:16:59 -07:00
Chih-Hung Hsieh 1df33b78aa Fix google-explicit-constructor warnings.
Bug: 28341362
Change-Id: I72bdd1df09cea91743aa89dab4cb0b9db2657e2d
2016-04-29 14:10:10 -07:00
Alex Klyubin b6587f9895 Merge "zipalign supports -p also when checking alignment."
am: 401f8b953f

* commit '401f8b953fff2f510ef7c118cfef503981ab5be6':
  zipalign supports -p also when checking alignment.

Change-Id: I54d1a931f108ab80fafaf3f13a34d924175eb3a9
2016-04-29 20:32:47 +00:00
Alex Klyubin 401f8b953f Merge "zipalign supports -p also when checking alignment." 2016-04-29 20:26:17 +00:00
Alex Klyubin 01d6b59dcf 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
2016-04-29 12:32:17 -07:00
Stephen Hines e6ca87cc8c Merge "Switch to clang-2812033."
am: fb737e9

* commit 'fb737e9002f43d68473b68518808aab99da9abcf':
  Switch to clang-2812033.

Change-Id: Iffedb14b2c2f2da4d690336f5fa2122dea2e1c83
2016-04-27 22:46:07 +00:00
Stephen Hines fb737e9002 Merge "Switch to clang-2812033." 2016-04-27 22:33:05 +00:00
Yabin Cui 25b78edecb 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
2016-04-27 19:22:15 +00:00
Yabin Cui e13b4c61bd Merge "Use strip mode mini-debug-info by default except on mips." 2016-04-27 19:19:06 +00:00
Ying Wang 0c1d51db71 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
2016-04-27 16:59:13 +00:00
Ying Wang 85b9117190 Merge "Warn if there is file with unknown suffix in Java module's sources." 2016-04-27 16:49:10 +00:00
Yabin Cui 700883eadd Use strip mode mini-debug-info by default except on mips.
Bug: 27923447
Change-Id: I818dea44f126155b4b9b3cd929823d8eda1a1174
2016-04-26 17:39:59 -07:00
Igor Murashkin 2d9bba9735 old-cts: Add testng and libcoreoj test support
Bug: 27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32707
2016-04-26 17:00:22 -07:00