Commit Graph

28617 Commits

Author SHA1 Message Date
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
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
Mohamad Ayyash
230ef583b0 Merge "Use fs_config files for mksquashfs" into nyc-dev
am: b354a61

* commit 'b354a61f3ec3b4c6463aac2a80f23e5772b6b164':
  Use fs_config files for mksquashfs

Change-Id: I422bd6f5b8e7e587bec3caef1525497904268a96
2016-04-08 17:52:24 +00:00
Mohamad Ayyash
b354a61f3e Merge "Use fs_config files for mksquashfs" into nyc-dev 2016-04-08 17:39:06 +00: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
Mohamad Ayyash
8837882fb9 Use fs_config files for mksquashfs
BUG: 27467028
Change-Id: I7648030ad4b31d70a5d439e9552fd2cbfe288b74
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-04-07 22:10:51 -07: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
Shinichiro Hamaji
06dbe198b9 Merge "Add jack's argument files to prerequisites" 2016-04-08 04:45:24 +00:00
Svetoslav Ganov
07f509784c Merge "Add ext libs to AOSP - they are part of the system" into nyc-dev
am: 048faf9

* commit '048faf920cde39ccb97a0bd937362860199295b6':
  Add ext libs to AOSP - they are part of the system

Change-Id: Iddadf028161702bb7199d47165fbb189bebe22f8
2016-04-07 23:48:12 +00:00
Svetoslav Ganov
048faf920c Merge "Add ext libs to AOSP - they are part of the system" into nyc-dev 2016-04-07 23:36:40 +00:00
Svetoslav Ganov
8ead371831 Add ext libs to AOSP - they are part of the system
bug:27698377

Change-Id: Ic426e08e450598c53e4dbf9c734d808b19fae705
2016-04-07 15:29:58 -07:00
Ying Wang
be667a1128 Merge "Correct usage message for build_image.py" am: d63ec28
am: 334a418

* commit '334a4185a5ca29086963a8d450fb7a9e972cbd77':
  Correct usage message for build_image.py

Change-Id: Iee000ee9974b4cb7329fab87dc81fdba2affe93d
2016-04-07 22:24:15 +00:00
Maria Bornski
334a4185a5 Merge "Correct usage message for build_image.py"
am: d63ec28

* commit 'd63ec28bcfa69692b15b76510eb3f74372e10d3f':
  Correct usage message for build_image.py

Change-Id: I338b5b675a6bcac87b02f78d448896195f2b6eb7
2016-04-07 22:06:17 +00:00
Ying Wang
d63ec28bcf Merge "Correct usage message for build_image.py" 2016-04-07 21:51:21 +00:00
Alex Klyubin
5f520cef37 Merge "Remove support for DSA with SHA-512 from v2 signing." am: d71e120
am: a62efba

* commit 'a62efba64f0e352310ecf7b5eb15727a1d52bdf9':
  Remove support for DSA with SHA-512 from v2 signing.

Change-Id: I1e0757fe57118ee6012ebb28ffcae8bb604a2c25
2016-04-07 20:11:05 +00:00
Alex Klyubin
a62efba64f Merge "Remove support for DSA with SHA-512 from v2 signing."
am: d71e120

* commit 'd71e12028bc8602569153f175c822f7757af2611':
  Remove support for DSA with SHA-512 from v2 signing.

Change-Id: I71b2b99a5808b231334ab616c2b6e2a660c35870
2016-04-07 20:07:35 +00:00
Alex Klyubin
d71e12028b Merge "Remove support for DSA with SHA-512 from v2 signing." 2016-04-07 19:56:03 +00: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
Colin Cross
37241826f8 Merge "makeparallel: reset make\'s unlimited stack" am: a034129
am: 15f63e2

* commit '15f63e262ea685ff593e5e8c320ab88b0b15d878':
  makeparallel: reset make's unlimited stack

Change-Id: Iffb1189b6e883dbe7730cff571fb2836987aa66d
2016-04-07 18:12:57 +00:00
Colin Cross
15f63e262e Merge "makeparallel: reset make\'s unlimited stack"
am: a034129

* commit 'a034129176d8821efc2bc8d33e06d9aeb4d3fd16':
  makeparallel: reset make's unlimited stack

Change-Id: I6e159629c5fe2441f53e0e2687ab0e0478b68499
2016-04-07 18:09:32 +00:00
Colin Cross
a034129176 Merge "makeparallel: reset make's unlimited stack" 2016-04-07 18:03:59 +00:00
Alex Klyubin
60817689fa Remove support for DSA with SHA-512 from v2 signing.
Android platform does not support DSA with SHA-512. Thus, it does not
make sense to support this unsupported algorithm in APK Signature
Scheme v2.

Bug: 24331392
Change-Id: Ifba90ad5b11188bb968c28d9e0ed3f9cb13ce2e7
2016-04-07 10:24:56 -07: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
Colin Cross
8f9a53258b makeparallel: reset make's unlimited stack
make 3.81 sets its own stack size to be unlimited, but accidentally
leaves it unlimited for all child processes.  If it is unlimited, reset
it back to a reasonable default (8MB).

See http://savannah.gnu.org/bugs/?22010

Change-Id: Ieb0289823f12a421b59d8ab5292d3df3c6dfc27e
2016-04-06 17:59:14 -07:00
Maria Bornski
885dbb5111 Correct usage message for build_image.py
target_out_dir is now a required argument. Include this in the usage message.

Change-Id: If77d94ec5350b2c737d1dd1df28a51167b173058
2016-04-06 17:26:31 -07:00
Joe Onorato
969b6f8ada Remove unused module-info.txt generation.
Change-Id: Ic2e384ad3e2bae8e76a98818c18a99bf5d427b0e
2016-04-06 14:49:55 -07: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
eb15d0094b Merge "Fix code coverage for apps" into nyc-dev
am: e771251  -s ours

* commit 'e771251424bc01fbf663dd5aa8ffa6938bbae29c':
  Fix code coverage for apps

Change-Id: Ie49e766727139c04e429178cd19b508c1a963437
2016-04-05 07:23:15 +00:00
Sebastien Hertz
e771251424 Merge "Fix code coverage for apps" into nyc-dev 2016-04-05 07:11:48 +00:00
Mark Salyzyn
62b696af33 Merge "fs_config: introduce TARGET_FS_CONFIG_GEN" am: 54cb05c
am: 43284e2

* commit '43284e2dc5e1c802226bf1608dd85d33ad22907a':
  fs_config: introduce TARGET_FS_CONFIG_GEN

Change-Id: Idd4879971867f697a20c42dda4fcdf8086fd358f
2016-04-05 00:09:17 +00:00