OSDN Git Service

android-x86/build.git
8 years agoMake jack_check_timestamp depend on setup-jack-server
Colin Cross [Wed, 20 Apr 2016 00:22:29 +0000 (17:22 -0700)]
Make jack_check_timestamp depend on setup-jack-server

Some builds were failing with:
[  3% 2226/61362] /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
FAILED: /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
No Jack server running. Try 'jack-admin start-server'

While jack-admin was running concurrently:
[  3% 2226/61362] /bin/bash -c "(prebuilts/sdk/tools/jack-admin stop-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin kill-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin uninstall-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin install-server prebuilts/sdk/tools/jack-launcher.jar prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar  2>&1 || (exit 0) ) && (mkdir -p \"/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/\" ) && (JACK_SERVER_VM_ARGUMENTS=\"-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/jack-server-%u-%g.log\" prebuilts/sdk/tools/jack-admin start-server 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update server prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar 4.8.ALPHA 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-2.28.RELEASE.jar 2.28.RELEASE || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.26.ALPHA.jar 3.26.ALPHA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.27.BETA.jar 3.27.BETA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.30.BETA.jar 3.30.BETA || exit 47 )"
Stopping background server
Killing background server
No Jack server to kill
Removing jack server from "/Users/android-build/.jack-server"
Installing jack server in "/Users/android-build/.jack-server"
Launching Jack server java -XX:MaxJavaStackTraceDepth=-1 -Djava.io.tmpdir=/buildbot/tmp -Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/jack-server-%u-%g.log -cp /Users/android-build/.jack-server/launcher.jar com.android.jack.launcher.ServerLauncher

(cherry picked from commit febe2bcc217b3dc546ea7bbf0361261a7b482b17)

Change-Id: I406afc87b4f7dda49406c4e1674430d223914e8d

8 years agoMerge "Enable asan/ubsan for mips"
Stephen Hines [Wed, 20 Apr 2016 04:44:39 +0000 (04:44 +0000)]
Merge "Enable asan/ubsan for mips"

8 years agoMerge "Don't reset LOCAL_*MODULE_STEM."
Ying Wang [Tue, 19 Apr 2016 20:50:38 +0000 (20:50 +0000)]
Merge "Don't reset LOCAL_*MODULE_STEM."

8 years agoDon't reset LOCAL_*MODULE_STEM.
Ying Wang [Tue, 19 Apr 2016 19:13:54 +0000 (12:13 -0700)]
Don't reset LOCAL_*MODULE_STEM.

By resetting we lose LOCAL_*MODULE_STEM values for the second include
of the *_internal.mk.
We don't need to reset because we now store the default value to a
temporary variable my_*module_stem in configure_module_stem.mk.

Bug: 27775991
Change-Id: I36d1ff3d177818677fb38bdb3d340dd2ff34c404

8 years agoMerge "Make sure platform libraries are built, regardless of webview.apk"
Dimitry Ivanov [Tue, 19 Apr 2016 17:07:20 +0000 (17:07 +0000)]
Merge "Make sure platform libraries are built, regardless of webview.apk"

8 years agoMake sure platform libraries are built, regardless of webview.apk
Nikola Veljkovic [Fri, 8 Apr 2016 14:55:20 +0000 (16:55 +0200)]
Make sure platform libraries are built, regardless of webview.apk

Prebuilt WebView is missing for mips64 architecture. Allow device
to boot without it, by making sure platform support libraries are
part of the system image.

WebView APK can then be installed separately.

Change-Id: Iabbb5e6a4778b7542d24bb4f789a7be96232e50c

8 years agoMerge "Add core-lambda-stubs to default classpath for target libs compiling using...
Neil Fuller [Tue, 19 Apr 2016 08:13:22 +0000 (08:13 +0000)]
Merge "Add core-lambda-stubs to default classpath for target libs compiling using javac"

8 years agoMerge "Revert "Use strip mode mini-debug-info by default.""
Yabin Cui [Tue, 19 Apr 2016 03:42:04 +0000 (03:42 +0000)]
Merge "Revert "Use strip mode mini-debug-info by default.""

8 years agoRevert "Use strip mode mini-debug-info by default."
Yabin Cui [Tue, 19 Apr 2016 03:38:34 +0000 (03:38 +0000)]
Revert "Use strip mode mini-debug-info by default."

This reverts commit 0e131e7e2c93c9ce7627b90eb59cda286d85ffd8.

breaks in aosp_mips-eng

Change-Id: I468b0a47c878ffde9afc78442e8d4f0dabf7eb6e

8 years agoMerge "Use strip mode mini-debug-info by default."
Yabin Cui [Tue, 19 Apr 2016 02:52:21 +0000 (02:52 +0000)]
Merge "Use strip mode mini-debug-info by default."

8 years agoMerge "Move sysfs_writable to emulator specific policy"
Treehugger Robot [Mon, 18 Apr 2016 23:14:50 +0000 (23:14 +0000)]
Merge "Move sysfs_writable to emulator specific policy"

8 years agoMove sysfs_writable to emulator specific policy
Nick Kralevich [Mon, 18 Apr 2016 22:18:09 +0000 (15:18 -0700)]
Move sysfs_writable to emulator specific policy

This type is never used in core policy, only by emulators.
Move the definition of this type to where it's used.

Bug: 28221393
Change-Id: I38dbc12dbe9813f323d4bcd5f07679db57b2fd4a

8 years agoMerge "Address emulator specific SELinux denials"
Nick Kralevich [Mon, 18 Apr 2016 22:17:16 +0000 (22:17 +0000)]
Merge "Address emulator specific SELinux denials"

8 years agoAddress emulator specific SELinux denials
Nick Kralevich [Mon, 18 Apr 2016 20:28:04 +0000 (13:28 -0700)]
Address emulator specific SELinux denials

(cherrypicked from commit 841f6d870db50862bb6be2e963149f46768f8aca)

Fix the following denials:

  avc: denied { search } for pid=222 comm="system_server"
  name="qemu_trace" dev="sysfs" ino=45 scontext=u:r:system_server:s0
  tcontext=u:object_r:sysfs_writable:s0 tclass=dir permissive=1

  avc: denied { open } for pid=222 comm="system_server"
  name="u:object_r:opengles_prop:s0" dev="tmpfs" ino=1429
  scontext=u:r:system_server:s0 tcontext=u:object_r:opengles_prop:s0
  tclass=file permissive=1

  avc: denied { read } for pid=222 comm="system_server"
  name="u:object_r:radio_noril_prop:s0" dev="tmpfs" ino=1430
  scontext=u:r:system_server:s0 tcontext=u:object_r:radio_noril_prop:s0
  tclass=file permissive=1

  avc: denied { open } for pid=222 comm="system_server"
  name="u:object_r:radio_noril_prop:s0" dev="tmpfs" ino=1430
  scontext=u:r:system_server:s0 tcontext=u:object_r:radio_noril_prop:s0
  tclass=file permissive=1

  avc: denied { getattr } for pid=222 comm="system_server"
  path="/dev/__properties__/u:object_r:radio_noril_prop:s0" dev="tmpfs"
  ino=1430 scontext=u:r:system_server:s0
  tcontext=u:object_r:radio_noril_prop:s0 tclass=file permissive=1

  avc: denied { search } for pid=424 comm="putmethod.latin"
  name="qemu_trace" dev="sysfs" ino=45
  scontext=u:r:untrusted_app:s0:c512,c768
  tcontext=u:object_r:sysfs_writable:s0 tclass=dir permissive=1

Bug: 28221393
Change-Id: I6fce1127d9d9e8bc0119bace3f142d51382401c0

8 years agoMerge "fs_config: include both oem ranges"
Treehugger Robot [Mon, 18 Apr 2016 20:35:27 +0000 (20:35 +0000)]
Merge "fs_config: include both oem ranges"

8 years agoMerge "Adding gcc-specific disable of Wattributes in preparation for libcxx rebase."
Dan Austin [Mon, 18 Apr 2016 18:23:10 +0000 (18:23 +0000)]
Merge "Adding gcc-specific disable of Wattributes in preparation for libcxx rebase."

8 years agoAdd core-lambda-stubs to default classpath for target libs compiling using javac
Neil Fuller [Fri, 19 Feb 2016 10:37:22 +0000 (10:37 +0000)]
Add core-lambda-stubs to default classpath for target libs compiling using javac

In order to compile lambda code javac requires various invokedynamic-
related classes to be present. This change adds stubs needed for
javac to compile lambdas.

Bug: 27475234
Bug: 26753820
Bug: 26604040
(cherry picked from commit b08544ed7d24b7b065debc061290ec55eaeced20)

Change-Id: Ie82600da21a9dbe2348e96aef1c5e966a7a1ef5a

8 years agoUse strip mode mini-debug-info by default.
Yabin Cui [Sat, 16 Apr 2016 00:42:17 +0000 (17:42 -0700)]
Use strip mode mini-debug-info by default.

Bug: 27923447
Change-Id: If52eed69ea5c2e91bffacdb8520bf53deafced3e

8 years agoMerge "Add strip mode mini-debug-info."
Yabin Cui [Sat, 16 Apr 2016 00:23:50 +0000 (00:23 +0000)]
Merge "Add strip mode mini-debug-info."

8 years agoAdd strip mode mini-debug-info.
Yabin Cui [Tue, 29 Mar 2016 19:22:20 +0000 (12:22 -0700)]
Add strip mode mini-debug-info.

Mini-debug-info strip mode strips most debug information, but
maintains minimal debugging information similar to
https://sourceware.org/gdb/onlinedocs/gdb/MiniDebugInfo.html.

Bug: 27923447

Change-Id: I0405f0b3c33cb3cadeafbd22ce94d645c4dbe7b9

8 years agoMerge "Skip verifying the partition with no changed blocks."
Treehugger Robot [Fri, 15 Apr 2016 04:03:42 +0000 (04:03 +0000)]
Merge "Skip verifying the partition with no changed blocks."

8 years agoSkip verifying the partition with no changed blocks.
Tao Bao [Thu, 14 Apr 2016 22:58:05 +0000 (15:58 -0700)]
Skip verifying the partition with no changed blocks.

For incremental BBOTAs, commit [1] changed to verify only the touched
blocks to reduce the update time. This CL fixes the bug when there's no
changed block between the two builds.

[1]: commit d522bdc9edbf64d15a59c6924853b2e2c8c39e90

Bug: 27813356
Bug: 28195498
Change-Id: Ia752d3cf034c544517458ed15df509d4596e21fa
(cherry picked from commit f9efe284a4f8f1e40ea634c5e86f3d5e9935d8c8)

8 years agoMerge "Makefile: Pack squashfs and f2fs tools into otatools.zip."
Treehugger Robot [Thu, 14 Apr 2016 23:14:07 +0000 (23:14 +0000)]
Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip."

8 years agoMakefile: Pack squashfs and f2fs tools into otatools.zip.
Tao Bao [Thu, 14 Apr 2016 19:11:36 +0000 (12:11 -0700)]
Makefile: Pack squashfs and f2fs tools into otatools.zip.

The following tools are essential to create squashfs and f2fs images
during signing (if applicable).

squashfs: mksquashfs and mksquashfsimage.sh
f2fs: make_f2fs and mkf2fsuserimg.sh

Bug: 28179154
Change-Id: Ia48bc6d9a40d2667bc6f2c973bd0c55eed7a06fc
(cherry picked from commit cffaf73f8471bfa2c2f19e6e51c35e30c1924aa7)

8 years agoMerge "Allow to force min sdk given to Jack"
Yohann Roussel [Thu, 14 Apr 2016 21:14:38 +0000 (21:14 +0000)]
Merge "Allow to force min sdk given to Jack"

8 years agoAllow to force min sdk given to Jack
Yohann Roussel [Thu, 14 Apr 2016 19:51:46 +0000 (21:51 +0200)]
Allow to force min sdk given to Jack

Allows setting the min sdk version for target Jack commands,
overriding the default value obtained from LOCAL_SDK_CURRENT.

Bug: 28188420
Change-Id: I1b84ad8a7b6ae30639f8ade455c1e542af5692e4

8 years agoMerge "Reject Google's build of JDK."
Ying Wang [Thu, 14 Apr 2016 18:49:07 +0000 (18:49 +0000)]
Merge "Reject Google's build of JDK."

8 years agoReject Google's build of JDK.
Ying Wang [Wed, 13 Apr 2016 21:33:00 +0000 (14:33 -0700)]
Reject Google's build of JDK.

Bug: 28097637
Change-Id: I8afbd48230bdd1f198a873f72df1c178bed38d0e

8 years agoMerge "Add support for Brillo partitioning."
David Zeuthen [Thu, 14 Apr 2016 16:04:30 +0000 (16:04 +0000)]
Merge "Add support for Brillo partitioning."

8 years agoMerge "releasetools: Only verify the blocks to be touched."
Treehugger Robot [Thu, 14 Apr 2016 00:53:39 +0000 (00:53 +0000)]
Merge "releasetools: Only verify the blocks to be touched."

8 years agoreleasetools: Only verify the blocks to be touched.
Tao Bao [Tue, 12 Apr 2016 22:53:16 +0000 (15:53 -0700)]
releasetools: Only verify the blocks to be touched.

For incremental BBOTAs, we used to verify the integrity of all the
blocks in the source partition. In order to reduce the time cost under
recovery, this CL changes to only verify the blocks that will be touched
in the given OTA package (BBOTA >= 3 only). This is a trade-off between
performance and reliability.

Bug: 27813356
Change-Id: I3975ae6f461f0f7e58d24f1df7df46a449d2988b
(cherry picked from commit d522bdc9edbf64d15a59c6924853b2e2c8c39e90)

8 years agoMerge "Monotonic flag sets incorrectly in rangelib"
Tianjie Xu [Wed, 13 Apr 2016 21:48:53 +0000 (21:48 +0000)]
Merge "Monotonic flag sets incorrectly in rangelib"

8 years agoMonotonic flag sets incorrectly in rangelib
Tianjie Xu [Fri, 8 Apr 2016 03:17:48 +0000 (20:17 -0700)]
Monotonic flag sets incorrectly in rangelib

After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.

Bug:28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac

8 years agoMerge "Remove post-install verification"
Tianjie Xu [Wed, 13 Apr 2016 19:19:03 +0000 (19:19 +0000)]
Merge "Remove post-install verification"

8 years agoAdd support for Brillo partitioning.
David Zeuthen [Fri, 8 Apr 2016 19:08:03 +0000 (15:08 -0400)]
Add support for Brillo partitioning.

To generate partition tables in the Android build system, simply add
the path to a .bpt file to the BOARD_BPT_INPUT_FILES variable.

 BOARD_BPT_INPUT_FILES += "hardware/bsp/vendor/soc/board/board-specific.bpt"

The variable BOARD_BPT_DISK_SIZE can be used to specify or override
the disk size, for example:

 BOARD_BPT_DISK_SIZE := "10 GiB"

Additional arguments to 'bpttool make_table' can be specified in the
variable BOARD_BPT_MAKE_TABLE_ARGS.

If BOARD_BPT_INPUT_FILES is set, the build system generates two files

 partition-table.img
 partition-table.bpt

in ${ANDROID_PRODUCT_OUT} using 'bpttool make_table'. The former is
the binary partition tables generated using bptool's --output_gpt
option and the latter is a JSON file generated using the --output_json
option. These files will also be put in the IMAGES/ directory of
target-files.zip when running 'm dist'.

BUG=27831397
TEST=Manually tested.

Change-Id: Iedd15354afb2dd483dcb9bc001360b2a37fd6dc0

8 years agoMerge "Always use ensure_start to ensure goma's daemon runs"
Shinichiro Hamaji [Wed, 13 Apr 2016 05:07:00 +0000 (05:07 +0000)]
Merge "Always use ensure_start to ensure goma's daemon runs"

8 years agoRemove post-install verification
Tianjie Xu [Fri, 25 Mar 2016 22:01:33 +0000 (15:01 -0700)]
Remove post-install verification

post-install verification calls range_sha1() and checks if the given
partition has expected contents. It takes roughly 20 seconds on
angler with 2.8G system image. Remove it to speed up OTA update. Also
abort the update if block_image_update() fails, as we were relying on
post-install verification to capture block_image_update() failures.

cherry-picked from commit b2deb220335e1059a3c95d8063705f5706604bdb
Bug: 27729678
Change-Id: I8123cd8929295ec26df247acf6bb51df813771d9

8 years agoMerge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS"
Treehugger Robot [Tue, 12 Apr 2016 21:24:51 +0000 (21:24 +0000)]
Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS"

8 years agoMerge "releasetools: Use fixed timestamp in otacerts.zip."
Tao Bao [Tue, 12 Apr 2016 16:32:32 +0000 (16:32 +0000)]
Merge "releasetools: Use fixed timestamp in otacerts.zip."

8 years agoAdd support for LOCAL_EXPORT_*_LIBRARY_HEADERS
Christopher Wiley [Mon, 11 Apr 2016 19:40:36 +0000 (12:40 -0700)]
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

8 years agoreleasetools: Use fixed timestamp in otacerts.zip.
Tao Bao [Tue, 12 Apr 2016 06:05:52 +0000 (23:05 -0700)]
releasetools: Use fixed timestamp in otacerts.zip.

We were using zipfile.write() to write system/etc/security/otacerts.zip
when signing for release. It led to unexpected timestamp change in the
generated otacerts.zip and non-idempotent signed images when signing the
same target_files.zip.

Replace with common.ZipWrite() to always use a fixed timestamp.

Bug: 28122968
Change-Id: Ia6cf4b7d380cbf72ed7050ebb60c932dc8826d87
(cherry picked from commit 7ee3a9678e7191c48f0ba4e04792fe97925c1aa1)

8 years agoAlways use ensure_start to ensure goma's daemon runs
Shinichiro Hamaji [Tue, 12 Apr 2016 09:14:28 +0000 (18:14 +0900)]
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

8 years agoMerge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS"
Andreas Gampe [Tue, 12 Apr 2016 02:46:58 +0000 (02:46 +0000)]
Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS"

8 years agoBuild: Add ART_BOOT_IMAGE_EXTRA_ARGS
Andreas Gampe [Mon, 11 Apr 2016 22:10:09 +0000 (15:10 -0700)]
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

8 years agoMerge "Update code coverage filtering"
Sebastien Hertz [Mon, 11 Apr 2016 14:31:35 +0000 (14:31 +0000)]
Merge "Update code coverage filtering"

8 years agofs_config: include both oem ranges
William Roberts [Sat, 9 Apr 2016 05:03:42 +0000 (22:03 -0700)]
fs_config: include both oem ranges

Support both OEM and OEM2 ranges as defined by
private/android_filesystem_config.h.

Change-Id: I1aef62fa446301bb68b0309b198f3fe8b5eb92c7
Signed-off-by: William Roberts <william.c.roberts@intel.com>
8 years agoUpdate code coverage filtering
Sebastien Hertz [Wed, 6 Apr 2016 16:18:47 +0000 (18:18 +0200)]
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

8 years agoMerge "Add jack's argument files to prerequisites"
Shinichiro Hamaji [Fri, 8 Apr 2016 04:45:23 +0000 (04:45 +0000)]
Merge "Add jack's argument files to prerequisites"

8 years agoMerge "Correct usage message for build_image.py"
Ying Wang [Thu, 7 Apr 2016 21:51:21 +0000 (21:51 +0000)]
Merge "Correct usage message for build_image.py"

8 years agoMerge "Remove support for DSA with SHA-512 from v2 signing."
Alex Klyubin [Thu, 7 Apr 2016 19:56:03 +0000 (19:56 +0000)]
Merge "Remove support for DSA with SHA-512 from v2 signing."

8 years agoMerge "makeparallel: reset make's unlimited stack"
Colin Cross [Thu, 7 Apr 2016 18:03:59 +0000 (18:03 +0000)]
Merge "makeparallel: reset make's unlimited stack"

8 years agoRemove support for DSA with SHA-512 from v2 signing.
Alex Klyubin [Thu, 7 Apr 2016 17:24:56 +0000 (10:24 -0700)]
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

8 years agoAdd jack's argument files to prerequisites
Shinichiro Hamaji [Thu, 7 Apr 2016 09:56:42 +0000 (18:56 +0900)]
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

8 years agoMerge "Add Bison binary and its data to prerequisite"
Shinichiro Hamaji [Thu, 7 Apr 2016 03:48:31 +0000 (03:48 +0000)]
Merge "Add Bison binary and its data to prerequisite"

8 years agoMerge "Fix dependencies of protoc with nanopb-c plugin"
Shinichiro Hamaji [Thu, 7 Apr 2016 03:48:02 +0000 (03:48 +0000)]
Merge "Fix dependencies of protoc with nanopb-c plugin"

8 years agomakeparallel: reset make's unlimited stack
Colin Cross [Thu, 7 Apr 2016 00:59:14 +0000 (17:59 -0700)]
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

8 years agoCorrect usage message for build_image.py
Maria Bornski [Fri, 4 Sep 2015 18:13:16 +0000 (11:13 -0700)]
Correct usage message for build_image.py

target_out_dir is now a required argument. Include this in the usage message.

Change-Id: If77d94ec5350b2c737d1dd1df28a51167b173058

8 years agoAdding gcc-specific disable of Wattributes in preparation for libcxx rebase.
Dan Austin [Wed, 6 Apr 2016 18:18:30 +0000 (11:18 -0700)]
Adding gcc-specific disable of Wattributes in preparation for libcxx rebase.

Change-Id: Ida49761801e58b2475e006525e3ea2bbad3731af

8 years agoFix dependencies of protoc with nanopb-c plugin
Shinichiro Hamaji [Tue, 5 Apr 2016 08:34:51 +0000 (17:34 +0900)]
Fix dependencies of protoc with nanopb-c plugin

Bug: 27954979
Change-Id: Ic06b5288b092d8ea5225516069845bfc2ffa9cd1

8 years agoAdd Bison binary and its data to prerequisite
Shinichiro Hamaji [Tue, 5 Apr 2016 11:12:48 +0000 (20:12 +0900)]
Add Bison binary and its data to prerequisite

Bug: 27954979
Change-Id: Id68425ef85c07b9bd06d9640f4bf96270af1b893

8 years agoMerge "Remove mips special case."
Dan Albert [Tue, 5 Apr 2016 18:51:16 +0000 (18:51 +0000)]
Merge "Remove mips special case."

8 years agoMerge "Fix code coverage for apps"
Sebastien Hertz [Tue, 5 Apr 2016 09:20:21 +0000 (09:20 +0000)]
Merge "Fix code coverage for apps"

8 years agoRemove mips special case.
Dan Albert [Tue, 5 Apr 2016 07:26:43 +0000 (00:26 -0700)]
Remove mips special case.

The NDK doesn't have an r6 subdir.

Bug: http://b/28009632
Change-Id: I482723a1b7400ed13dc70acad24fbed96683f460

8 years agoMerge "fs_config: introduce TARGET_FS_CONFIG_GEN"
Mark Salyzyn [Mon, 4 Apr 2016 22:37:33 +0000 (22:37 +0000)]
Merge "fs_config: introduce TARGET_FS_CONFIG_GEN"

8 years agoMerge "Remove libdivsufsort shared library from otatools."
Sen Jiang [Mon, 4 Apr 2016 21:43:11 +0000 (21:43 +0000)]
Merge "Remove libdivsufsort shared library from otatools."

8 years agoMerge "libm's headers have moved to live with their libc cousins."
Elliott Hughes [Mon, 4 Apr 2016 20:44:35 +0000 (20:44 +0000)]
Merge "libm's headers have moved to live with their libc cousins."

8 years agoRemove libdivsufsort shared library from otatools.
Sen Jiang [Mon, 4 Apr 2016 20:44:06 +0000 (13:44 -0700)]
Remove libdivsufsort shared library from otatools.

The library is now a static library.

Bug: 26955860
Change-Id: I64525737da1451895c255a30904a1e3e4ad8d253

8 years agoMerge "Update NDK libc++ header paths."
Dan Albert [Mon, 4 Apr 2016 20:27:42 +0000 (20:27 +0000)]
Merge "Update NDK libc++ header paths."

8 years agolibm's headers have moved to live with their libc cousins.
Elliott Hughes [Mon, 4 Apr 2016 19:58:50 +0000 (12:58 -0700)]
libm's headers have moved to live with their libc cousins.

(To reduce the need for this kind of thing in the various build systems.)

Change-Id: I4430a76a749262b0234c194434b331f7294da009

8 years agoMerge "Always build squashfs host tools"
Mohamad Ayyash [Mon, 4 Apr 2016 19:42:25 +0000 (19:42 +0000)]
Merge "Always build squashfs host tools"

8 years agoAlways build squashfs host tools
Mohamad Ayyash [Mon, 4 Apr 2016 19:31:41 +0000 (12:31 -0700)]
Always build squashfs host tools

Now that mac compatibility has been fixed

BUG: 27657762
Change-Id: I49933ccedf74b9d172967dad721971a752047da6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
8 years agoFix code coverage for apps
Sebastien Hertz [Thu, 31 Mar 2016 14:48:26 +0000 (16:48 +0200)]
Fix code coverage for apps

When building apps with EMMA_INSTRUMENT=true, we must ensure that
jacoco is at least on the classpath (or even embedded for unbundled
branches) and that proguard will ignore jacoco classes. Otherwise
the Jack compilation would fail.

For unbundled build, we include the proguard configuration file
build/core/proguard.jacoco.flags to ignore jacoco classes.

For full build, we ensure jacoco is on the classpath during the
jack compilation.

Bug: 27607712

(cherry picked from commit d9641e01f300ffc359a034a3e897fd8ada78237a)

Change-Id: Ib46c91d03721f2418b15c17546d4f322f2f90a28

8 years agoMerge "[RenderScript] Update the build rules for x86_64 support lib."
Miao Wang [Fri, 1 Apr 2016 20:22:41 +0000 (20:22 +0000)]
Merge "[RenderScript] Update the build rules for x86_64 support lib."

8 years agoMerge "Recognize more Clang-Tidy google warning patterns."
Chih-hung Hsieh [Fri, 1 Apr 2016 16:15:57 +0000 (16:15 +0000)]
Merge "Recognize more Clang-Tidy google warning patterns."

8 years agoRecognize more Clang-Tidy google warning patterns.
Chih-Hung Hsieh [Thu, 31 Mar 2016 23:14:55 +0000 (16:14 -0700)]
Recognize more Clang-Tidy google warning patterns.

* Many AOSP C/C++ code have google-readability warnings.

Bug: http://b/27779618
Change-Id: Ic7d33b957da5c1062410f48ef18bb68a5aa259e9

8 years agoMerge "Add LOCAL_NDK_VERSION."
Dan Albert [Thu, 31 Mar 2016 23:11:26 +0000 (23:11 +0000)]
Merge "Add LOCAL_NDK_VERSION."

8 years ago[RenderScript] Update the build rules for x86_64 support lib.
Miao Wang [Wed, 30 Mar 2016 20:29:42 +0000 (13:29 -0700)]
[RenderScript] Update the build rules for x86_64 support lib.

Bug: 19735423

  - Unlike other archs, x86_64 has both usr/lib and usr/lib64. we need
    to search for libm.so and libc.so in lib64/. Otherwise the linker
    will report error.

Change-Id: I2859bee066a9eb100828d90da8adf0f9817d77e6
(cherry picked from commit 57ef7ea4901bf4a7c89a078b1c859310abf1d79c)

8 years agoUpdate NDK libc++ header paths.
Dan Albert [Wed, 23 Mar 2016 00:17:40 +0000 (17:17 -0700)]
Update NDK libc++ header paths.

The r11 libc++ uses libc++abi instead of libgabi++.

Bug: http://b/27801981
Change-Id: I5b90c14125dc024b2b290897bb3ef1c8d9546a7b

8 years agoAdd LOCAL_NDK_VERSION.
Dan Albert [Wed, 30 Mar 2016 21:13:50 +0000 (14:13 -0700)]
Add LOCAL_NDK_VERSION.

Used to select between releases of the NDK (r10, r11, etc).

Some of the libraries we use in Android come as prebuilts from
google3, which are most likely built against an older NDK than what
we have in the platform. Since things may not be ABI compatible
release to release, we need to keep legacy versions accessible for
those to keep building.

Change-Id: Ia3df42fa6f3a7bd5108ff6bbb0f2ca06239c3be9

8 years agoMerge "Remove support of disabling Jack."
Ying Wang [Thu, 31 Mar 2016 16:52:49 +0000 (16:52 +0000)]
Merge "Remove support of disabling Jack."

8 years agoMerge "Replace $(shell) in recipe with subshell."
Ying Wang [Thu, 31 Mar 2016 16:46:18 +0000 (16:46 +0000)]
Merge "Replace $(shell) in recipe with subshell."

8 years agoReplace $(shell) in recipe with subshell.
Ying Wang [Thu, 31 Mar 2016 01:34:43 +0000 (18:34 -0700)]
Replace $(shell) in recipe with subshell.

Bug: 27925180
Change-Id: I4a735755e4f818f6ce608c87ad111b9dd205ef41

8 years agoMerge "Remove extraneous /"
Dan Willemsen [Wed, 30 Mar 2016 21:24:08 +0000 (21:24 +0000)]
Merge "Remove extraneous /"

8 years agoRemove support of disabling Jack.
Ying Wang [Tue, 29 Mar 2016 01:39:42 +0000 (18:39 -0700)]
Remove support of disabling Jack.

We removed code and variables related to running dx on classes.jar in
this change. Also removed target emma rules (but kept the emma rules for
host java libraries), for it's now done by Jack.
We still support to build classes.jar (and javalib.jar for static Java
libraries) using javac, because tools like javadoc need class files as
input.
Removed the obsolete install-dex-debug.

Bug: 27400061
Change-Id: If0bcdfe62cb181a98754fb0dbe1c12c92e38d3e8

8 years agoRemove extraneous /
Dan Willemsen [Wed, 30 Mar 2016 20:36:01 +0000 (13:36 -0700)]
Remove extraneous /

This matches the line we use in Soong, and behaves no differently.

Change-Id: I4487f7f5555edd08dc67a22d547f8218d46ccd8f

8 years agoMerge "Keep emma files for host rules"
Ying Wang [Wed, 30 Mar 2016 16:56:54 +0000 (16:56 +0000)]
Merge "Keep emma files for host rules"

8 years agoMerge "Recognize Clang-Tidy warning messages."
Chih-hung Hsieh [Wed, 30 Mar 2016 16:12:34 +0000 (16:12 +0000)]
Merge "Recognize Clang-Tidy warning messages."

8 years agoKeep emma files for host rules
Sebastien Hertz [Wed, 30 Mar 2016 07:38:09 +0000 (09:38 +0200)]
Keep emma files for host rules

Keep coverage.em file name for host rules where Jack is not called.

(Partially reverts change 491c9ce48add521e7c0cdbe1c1fa7ea392b775a5)

Bug: 27822188
Change-Id: Ia9344e17ecbecfb9c335608740ab7dc5490c48d5

8 years agoMerge "Darwin: Use the same `ar` as Soong"
Dan Willemsen [Wed, 30 Mar 2016 00:38:32 +0000 (00:38 +0000)]
Merge "Darwin: Use the same `ar` as Soong"

8 years agoDarwin: Use the same `ar` as Soong
Dan Willemsen [Tue, 29 Mar 2016 23:21:32 +0000 (16:21 -0700)]
Darwin: Use the same `ar` as Soong

Soong uses the copy of `ar` in the OSX SDK instead of the wrapper in
/usr/bin/ar. /usr/bin/ar appears to be a thin wrapper that looks up the
current SDK and passes execution to it. Soong does this so that it can
actually set up a dependency on the tool.

Change-Id: Ia4e4fbe3287539933fa98a1354c3ccee91f4d552

8 years agoRecognize Clang-Tidy warning messages.
Chih-Hung Hsieh [Tue, 29 Mar 2016 22:33:11 +0000 (15:33 -0700)]
Recognize Clang-Tidy warning messages.

* Put all Clang-Tidy warning messages in a group for now.
  There are too many coding style warnings.
* Change the 'top' link to the top of the page.
* Add a few more new clang compiler warnings.

Bug: http://b/27779618
Change-Id: I385b9db927a397704b56f53440301352da8694cf

8 years agoMerge "Forbid Clang for Windows"
Dan Willemsen [Tue, 29 Mar 2016 20:54:23 +0000 (20:54 +0000)]
Merge "Forbid Clang for Windows"

8 years agoMerge "Fix dependencies around tools/*-event-log-tags.py"
Shinichiro Hamaji [Tue, 29 Mar 2016 20:40:31 +0000 (20:40 +0000)]
Merge "Fix dependencies around tools/*-event-log-tags.py"

8 years agoForbid Clang for Windows
Dan Willemsen [Tue, 29 Mar 2016 19:34:03 +0000 (12:34 -0700)]
Forbid Clang for Windows

Clang and MinGW are not expected to work together currently, and you get
strange errors when this is attempted. Instead, error out with a clear
error message.

Before the windows build rewrite, we'd just explicitly set my_clang to
false without checking what the module asked for. Now, error out if the
module explicitly asked for clang, since by default they'd have it
already if it wasn't for windows. That way when Clang+Windows does
become possible, it can gradually be tested by setting LOCAL_CLANG to
true.

Change-Id: I9e0b0dca30946d94894119443f2fd0593cee1793

8 years agoMerge "Only add jacocoagent if the package contains some java code."
allenhair [Tue, 29 Mar 2016 19:20:10 +0000 (19:20 +0000)]
Merge "Only add jacocoagent if the package contains some java code."

8 years agoFix dependencies around tools/*-event-log-tags.py
Shinichiro Hamaji [Mon, 28 Mar 2016 18:29:21 +0000 (03:29 +0900)]
Fix dependencies around tools/*-event-log-tags.py

We should regenerate merged tag files and java sources when
these scripts are updated.

Change-Id: Id5f11d6f480f3f74dab08f01e929ee2d7fafd2d0

8 years agoOnly add jacocoagent if the package contains some java code.
Allen Hair [Mon, 28 Mar 2016 19:52:37 +0000 (12:52 -0700)]
Only add jacocoagent if the package contains some java code.

Bug: 27877982
Change-Id: I8bf05d67a823402e7e488990753cc9005ec5e90b

8 years agoMerge "Rename emma coverage files"
Sebastien Hertz [Tue, 29 Mar 2016 07:17:12 +0000 (07:17 +0000)]
Merge "Rename emma coverage files"

8 years agoMerge "Remove javac support in host dex rules."
Ying Wang [Sat, 26 Mar 2016 01:41:38 +0000 (01:41 +0000)]
Merge "Remove javac support in host dex rules."

8 years agoMerge "[DO NOT MERGE] Remove code pulled in by accident."
Ying Wang [Sat, 26 Mar 2016 01:27:32 +0000 (01:27 +0000)]
Merge "[DO NOT MERGE] Remove code pulled in by accident."