Commit Graph

10777 Commits

Author SHA1 Message Date
Treehugger Robot
5f3b3689af Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS" 2016-04-12 21:24:51 +00:00
Andreas Gampe
7928bc8554 Build: Add ART_BOOT_IMAGE_EXTRA_ARGS
Allow to modify the boot image compilation. Can be used to easily
dump initialization failures.

Bug: 27265238

(cherry picked from commit 907fb03273)

Change-Id: I9d54c562a2e623b23b7c1dea9cdbe303786c95dd
2016-04-12 14:24:50 -07:00
Guang Zhu
97069b07c3 resolve merge conflicts of bc3720c to nyc-dev-plus-aosp
Change-Id: I2372a61a39131ede33cda95afc3c3ddd19e542f0
2016-04-12 13:06:20 -07:00
Ying Wang
8419b7f35e Include classes.jar with class files in aar.
As we switched to Jack the LOCAL_BUILT_MODULE (javalib.jar) now
include .jayce files.

Change-Id: If802e02bb20a9e105ca9563e6fe483f7acce00e6
2016-04-12 12:57:36 -07:00
Julien Desprez
188a1dd18f Benchmark have their own folder
Benchmark tests use a separate folder from native tests.

Bug: 27465556
Change-Id: Ife0f43062e36ffc856f41683ddc4d91a7787333e
2016-04-12 18:57:36 +01:00
Christopher Wiley
ff1c3f2b05 Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS
Listing a library in any of:

  LOCAL_EXPORT_SHARED_LIBRARY_HEADERS
  LOCAL_EXPORT_STATIC_LIBRARY_HEADERS

will cause the headers exported by that library to be exported from
the current library target as well.

This means that when library A's public headers include headers from
library B, library C which consumes A no longer has to explicitly list
A and B in its LOCAL_SHARED_LIBRARIES for the purpose of picking up B's
headers.

Bug: 27804373
Test: Introduced dependency on libbase to libbinder at the header level.
      Libraries that consume libbinder do not need to explicitly depend
      on libbase.

Change-Id: If69079f058a4a182c5ef5a3c5ba15035570da22d
2016-04-12 09:27:29 -07:00
Shinichiro Hamaji
91609e249a Always use ensure_start to ensure goma's daemon runs
Recent goma client automatically restarts when GOMA_*
environment variable changes. http://b/25676777 was fixed
2 months ago, so there wouldn't be old goma client.

Change-Id: I3b5419ce4bae4cf8180d8d0a53d2b4218d317fec
2016-04-12 18:14:28 +09:00
Andreas Gampe
0a0fd088c1 Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS" am: 8a547f1
am: c0f254a

* commit 'c0f254a5b9710f459fba044530bace0c4bb107e1':
  Build: Add ART_BOOT_IMAGE_EXTRA_ARGS

Change-Id: I98d2311fd4789ea9e31f753b5a2ea09ac605ce00
2016-04-12 03:06:52 +00:00
Andreas Gampe
c0f254a5b9 Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS"
am: 8a547f1

* commit '8a547f19b859e06baaf3c9495f3a2fc0eaa5905d':
  Build: Add ART_BOOT_IMAGE_EXTRA_ARGS

Change-Id: If44d2747e10e2b549e83c96f1916ca05b9af9d04
2016-04-12 03:01:39 +00:00
Andreas Gampe
907fb03273 Build: Add ART_BOOT_IMAGE_EXTRA_ARGS
Allow to modify the boot image compilation. Can be used to easily
dump initialization failures.

Bug: 27265238
Change-Id: I9d54c562a2e623b23b7c1dea9cdbe303786c95dd
2016-04-11 15:10:09 -07:00
Dan Willemsen
758f872836 Merge "Ensure prebuilt executables are executable" into nyc-dev 2016-04-11 19:59:10 +00:00
Dan Willemsen
23f326a67d Ensure prebuilt executables are executable
Use 'chmod +x' to make sure that they're executable, even if the source
file is not.

Bug: 28097475
Change-Id: Id155f6b4ff188f5c909fd6237fd64183af264f79
(cherry picked from commit 08420cbc8a)
2016-04-11 11:21:47 -07:00
Sebastien Hertz
e90a711014 Merge "Update code coverage filtering" am: cb49804
am: e0f8435

* commit 'e0f84353065a1d35c349e9e2939b3862a3aef7bd':
  Update code coverage filtering

Change-Id: I4787c538e3a47c792e68d639ae5d3fbfcd95f494
2016-04-11 14:46:20 +00:00
Sebastien Hertz
18da8dd97a Update code coverage filtering
Replaces old LOCAL_EMMA_COVERAGE_FILTER by new variables:
- LOCAL_JACK_COVERAGE_INCLUDE_FILTER for included classes
- LOCAL_JACK_COVERAGE_EXCLUDE_FILTER for excluded classes
Both variables can contain a comma-separated list of class names,
where * and ? are accepted wildcard (like foo.?ar.*).

When code coverage is enabled, we will use these variables to
pass code coverage filters on the Jack command-line.

Bug: 28014424

(cherry picked from commit 74ec3f49d1)

Change-Id: Ie4253981c0e6a62422ab84dfd67ef5eebc0b0284
2016-04-11 16:43:12 +02:00
Sebastien Hertz
e0f8435306 Merge "Update code coverage filtering"
am: cb49804

* commit 'cb49804e06adab2882bbcd15230b188f4977eb5a':
  Update code coverage filtering

Change-Id: Ia7f5f6a659cea62553865bb1030bc76e48c99b57
2016-04-11 14:41:01 +00:00
Sebastien Hertz
cb49804e06 Merge "Update code coverage filtering" 2016-04-11 14:31:35 +00:00
Ian Pedowitz
1ff4229c1f PLATFORM_PREVIEW_SDK_VERSION = 3 for DP3
am: 839ec10

* commit '839ec10bbc67c84ca35fe9cb8a56b087f344522e':
  PLATFORM_PREVIEW_SDK_VERSION = 3 for DP3

Change-Id: I813d5c4240473a93a6be0eb2dde4316ed1d26084
2016-04-09 00:31:57 +00:00
Ian Pedowitz
839ec10bbc PLATFORM_PREVIEW_SDK_VERSION = 3 for DP3
Bug: 27150977
Change-Id: I8f13cec505a73678fb605ee3bce00519d16c2f7e
2016-04-08 14:05:00 -07:00
Sebastien Hertz
74ec3f49d1 Update code coverage filtering
Replaces old LOCAL_EMMA_COVERAGE_FILTER by new variables:
- LOCAL_JACK_COVERAGE_INCLUDE_FILTER for included classes
- LOCAL_JACK_COVERAGE_EXCLUDE_FILTER for excluded classes
Both variables can contain a comma-separated list of class names,
where * and ? are accepted wildcard (like foo.?ar.*).

When code coverage is enabled, we will use these variables to
pass code coverage filters on the Jack command-line.

Bug: 28014424
Change-Id: Ic29c99b6feb7ea2251c29d659e7ea1f1c46d1ed1
2016-04-08 10:26:49 +02:00
Shinichiro Hamaji
f84255570d Merge "Add jack\'s argument files to prerequisites" am: 06dbe19
am: ac61fed

* commit 'ac61fedf9e9a68206d2f2507557cce14ee8524e6':
  Add jack's argument files to prerequisites

Change-Id: Id6959d79000252ab91823d2252297500a4dd6dd4
2016-04-08 08:13:04 +00:00
Shinichiro Hamaji
ac61fedf9e Merge "Add jack\'s argument files to prerequisites"
am: 06dbe19

* commit '06dbe198b9f50d71bf24b52819110594007b14ae':
  Add jack's argument files to prerequisites

Change-Id: Ib95413246000676fc050ee1c1e892dd8ea1b6b3f
2016-04-08 04:55:11 +00:00
Igor Murashkin
1d4ad6a527 old-cts: Add testng and libcoreoj test support
Bug: 27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32707
2016-04-07 16:55:08 -07:00
Colin Cross
4e2c57ab0a Pass SANTIIZE_HOST and SANITIZE_TARGET to soong
Change-Id: I80e2e386db3367383454adb1b0785b10e13a4c58
2016-04-07 13:33:06 -07:00
Joe Onorato
c76b3ab7ad Merge changes I8f95f3f8,Ic2e384ad into nyc-dev
am: 4b60ee5

* commit '4b60ee5b7b61ac7bdeb983469547e23d698332a2':
  Add generation of a module-info.json file
  Remove unused module-info.txt generation.

Change-Id: Ia291b6b93922bfacee331e2870a52eec89f0b108
2016-04-07 18:41:48 +00:00
Joe Onorato
4b60ee5b7b Merge changes I8f95f3f8,Ic2e384ad into nyc-dev
* changes:
  Add generation of a module-info.json file
  Remove unused module-info.txt generation.
2016-04-07 18:34:43 +00:00
Shinichiro Hamaji
4eaeef8df7 Add jack's argument files to prerequisites
Dex files should be updated when jack-default.args or
proguard*.flags are modified.

Bug: 27954979
Change-Id: I72a7084302f4ef92a89a8068f03f790dd7acd582
2016-04-07 18:56:42 +09:00
Shinichiro Hamaji
bae8b3f2d9 Merge "Add Bison binary and its data to prerequisite" am: 4d69fbf
am: 06af80f

* commit '06af80f6c4c1702b1aebea8cec56b49f43e88d4f':
  Add Bison binary and its data to prerequisite

Change-Id: I5039150bcb4d06677bd6d5fd4acea8e643fccb89
2016-04-07 03:56:24 +00:00
Shinichiro Hamaji
3a192c0246 Merge "Fix dependencies of protoc with nanopb-c plugin" am: 5e2d7f3
am: ae91743

* commit 'ae917433aaa92941bc2ad515f8bdb4f77c462ac0':
  Fix dependencies of protoc with nanopb-c plugin

Change-Id: Ib548b09c87f9be296e6e1fcb60ec0fcd4ddd0908
2016-04-07 03:56:23 +00:00
Shinichiro Hamaji
06af80f6c4 Merge "Add Bison binary and its data to prerequisite"
am: 4d69fbf

* commit '4d69fbf5beeb7f56c878ed8b3286b23521029f74':
  Add Bison binary and its data to prerequisite

Change-Id: I5ee7077db82707a4aaa5c7801e8dbc0b564316bb
2016-04-07 03:53:42 +00:00
Shinichiro Hamaji
ae917433aa Merge "Fix dependencies of protoc with nanopb-c plugin"
am: 5e2d7f3

* commit '5e2d7f320423bddb5494cdc1564afa040b98d004':
  Fix dependencies of protoc with nanopb-c plugin

Change-Id: Ib343e45fbe14ac06cb0b8205952cbfc3d57b59c6
2016-04-07 03:53:41 +00:00
Shinichiro Hamaji
4d69fbf5be Merge "Add Bison binary and its data to prerequisite" 2016-04-07 03:48:31 +00:00
Shinichiro Hamaji
5e2d7f3204 Merge "Fix dependencies of protoc with nanopb-c plugin" 2016-04-07 03:48:02 +00:00
Joe Onorato
48bd6f53f4 Add generation of a module-info.json file
This outputs all of the modules that the build system knows about
for this invocation.

Change-Id: I8f95f3f8443c18f7898ce90e287432cbd2b6db6d
2016-04-06 19:11:51 -07:00
Joe Onorato
969b6f8ada Remove unused module-info.txt generation.
Change-Id: Ic2e384ad3e2bae8e76a98818c18a99bf5d427b0e
2016-04-06 14:49:55 -07:00
Dan Austin
75e7af10b9 Adding gcc-specific disable of Wattributes in preparation for libcxx rebase.
Change-Id: Ida49761801e58b2475e006525e3ea2bbad3731af
2016-04-06 18:35:07 +00:00
Shinichiro Hamaji
a3184dc2ae Fix dependencies of protoc with nanopb-c plugin
Bug: 27954979
Change-Id: Ic06b5288b092d8ea5225516069845bfc2ffa9cd1
2016-04-06 13:54:03 +09:00
Shinichiro Hamaji
b708bc5533 Add Bison binary and its data to prerequisite
Bug: 27954979
Change-Id: Id68425ef85c07b9bd06d9640f4bf96270af1b893
2016-04-06 13:46:02 +09:00
Dan Albert
885c4d927d Merge "Remove mips special case." am: a6a6285
am: 7d4c8fe

* commit '7d4c8fefec0998048b34fcedc4f1c893e00919eb':
  Remove mips special case.

Change-Id: Ia55997b8dc087129e39028cd16fb9f3c49b950c0
2016-04-05 19:00:42 +00:00
Dan Albert
7d4c8fefec Merge "Remove mips special case."
am: a6a6285

* commit 'a6a6285686a753aaedebc2edcbf94f14cb7b6fdf':
  Remove mips special case.

Change-Id: I772f6383a3b26c39758be600f194e3f511ec6aa0
2016-04-05 18:57:31 +00:00
Dan Albert
a6a6285686 Merge "Remove mips special case." 2016-04-05 18:51:16 +00:00
Sebastien Hertz
25f94a74fb Merge "Fix code coverage for apps" am: 2e8a1fc
am: 274a5a5

* commit '274a5a5efe1447ba4c13faf2f31c30d8b1dd72e5':
  Fix code coverage for apps

Change-Id: I751ee937222a76c2795f2dcdc0e2ca86ea7924d4
2016-04-05 09:27:39 +00:00
Sebastien Hertz
274a5a5efe Merge "Fix code coverage for apps"
am: 2e8a1fc

* commit '2e8a1fc96695478be7e0d9efc3f99a305b10930b':
  Fix code coverage for apps

Change-Id: I0fc712c82c55079dc88b5d58ff29958e06f4885d
2016-04-05 09:24:40 +00:00
Sebastien Hertz
2e8a1fc966 Merge "Fix code coverage for apps" 2016-04-05 09:20:21 +00:00
Dan Albert
ce2fe3c121 Remove mips special case.
The NDK doesn't have an r6 subdir.

Bug: http://b/28009632
Change-Id: I482723a1b7400ed13dc70acad24fbed96683f460
2016-04-05 00:28:35 -07:00
Sebastien Hertz
e771251424 Merge "Fix code coverage for apps" into nyc-dev 2016-04-05 07:11:48 +00:00
Sen Jiang
d7c791429d Merge "Remove libdivsufsort shared library from otatools." am: aef8e28
am: 881a812

* commit '881a81226c580b8e86d2425215c0af3c4f067fcb':
  Remove libdivsufsort shared library from otatools.

Change-Id: I3eadccc20045ff30eb88c95e229ad7fb79852793
2016-04-04 21:50:41 +00:00
Sen Jiang
881a81226c Merge "Remove libdivsufsort shared library from otatools."
am: aef8e28

* commit 'aef8e28fa6f44f7da092aeee34ce2a7f3ec3d020':
  Remove libdivsufsort shared library from otatools.

Change-Id: If97e4bd6571ef64700e302f58080e203282b460f
2016-04-04 21:48:14 +00:00
Sen Jiang
aef8e28fa6 Merge "Remove libdivsufsort shared library from otatools." 2016-04-04 21:43:11 +00:00
Elliott Hughes
0fe311dc5f Merge "libm\'s headers have moved to live with their libc cousins." am: fcbd4d8
am: 617e0fc

* commit '617e0fc6daa51ca2088315e72ecb5a9de84529e0':
  libm's headers have moved to live with their libc cousins.

Change-Id: Id3b57b5d13f11da8e6f8182e3448bf7541fbd46c
2016-04-04 20:50:14 +00:00
Elliott Hughes
617e0fc6da Merge "libm\'s headers have moved to live with their libc cousins."
am: fcbd4d8

* commit 'fcbd4d8bfc9e8e6a6067d6e18205c39d16c4bfbb':
  libm's headers have moved to live with their libc cousins.

Change-Id: Ieff5329667f91a72e844d4febfcd1c88505b4d2c
2016-04-04 20:47:40 +00:00