OSDN Git Service
Yohann Roussel [Fri, 22 Apr 2016 15:51:50 +0000 (15:51 +0000)]
Merge changes I6e98fc65,Ia8665e7c
* changes:
Remove bootclasspath handling for Jack
Remove static libraries from Jack classpath
Yohann Roussel [Thu, 21 Apr 2016 14:49:10 +0000 (16:49 +0200)]
Remove bootclasspath handling for Jack
Bootclasspath libraries are already added in LOCAL_JAVA_LIBRARIES by
java.mk and host_dalvik_java_library.mk meaning that bootclasspath
handling was just doing a duplicate work and adding duplicated entries
to the classpath.
Also fix order of bootclasspath libraries for host.
Bug:
28307907
Change-Id: I6e98fc651a127435c029de65285dbf2cb04844af
Chih-hung Hsieh [Thu, 21 Apr 2016 21:01:45 +0000 (21:01 +0000)]
Merge "Call clang-tidy based on WITH_TIDY* variables."
Chih-Hung Hsieh [Thu, 31 Mar 2016 23:30:23 +0000 (16:30 -0700)]
Call clang-tidy based on WITH_TIDY* variables.
* Call clang-tidy before every C/C++ compilation if
(1) clang-tidy is found at $(PATH_TO_CLANG_TIDY)
(2) $(my_clang) is true
(3) LOCAL_TIDY is 1 or true, or
LOCAL_TIDY is undefined and WITH_TIDY is 1 or true.
* clang-tidy is called with -checks=$(my_tidy_checks),
which has default '-*,google*,-google-readability*'
and can be overwritten by WITH_TIDY_CHECKS.
* LOCAL_TIDY_CHECKS is appended to $(my_tidy_checks)
* Extra flags are passed to clang-tidy through
WITH_TIDY_FLAGS or LOCAL_TIDY_FLAGS.
* To quickly find and fix clang-tidy warnings, set $(WITH_TIDY_ONLY)
to 1 or true to skip compilation of C/C++ files.
* Add a PHONY tidy_only target,
which includes all $(cpp_objects) and $(c_objects).
* The 'mm' and 'mmm' functions are changed to call make with
the 'tidy_only' target when WITH_TIDY_ONLY is true or 1.
In that case, only clang-tidy is called for C and C++ files.
Bug: http://b/
27779618
Change-Id: I8adcfff217d68af49849b79aacee7d7654cafb1b
Yohann Roussel [Thu, 21 Apr 2016 14:30:18 +0000 (16:30 +0200)]
Remove static libraries from Jack classpath
Those libraries are already imported (or added to the classpath in the
case of the check command) meaning that they were all duplicated.
In addition to complicating the build this was also slowing down the
compilation.
Bug:
28307907
Change-Id: Ia8665e7c5ad8b567bd02de7839fa62e67a5668f7
Shinichiro Hamaji [Thu, 21 Apr 2016 06:10:38 +0000 (06:10 +0000)]
Merge "Add input dependencies to .img targets"
Shinichiro Hamaji [Thu, 21 Apr 2016 05:34:06 +0000 (05:34 +0000)]
Merge "Add normalize_path.py to prerequisites"
Ying Wang [Wed, 20 Apr 2016 20:58:16 +0000 (20:58 +0000)]
Merge "Allow to build native tests for translation arch only."
Ying Wang [Wed, 20 Apr 2016 18:53:39 +0000 (11:53 -0700)]
Allow to build native tests for translation arch only.
- To build a native test for translation arch only, use:
LOCAL_MODULE_TARGET_ARCH := <translation arch>
- Also disable building .odex for translation arch for Java libraries.
Bug:
27526885
Change-Id: I063e8876781c4424da7abebf1b9b7cb842ce205f
(cherry-pick from commit
d90eb21cd79fef3cc9566524d823cdf210799fcd)
Yohann Roussel [Wed, 20 Apr 2016 12:08:35 +0000 (12:08 +0000)]
Merge "Make 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
Stephen Hines [Wed, 20 Apr 2016 04:44:39 +0000 (04:44 +0000)]
Merge "Enable asan/ubsan for mips"
Ying Wang [Tue, 19 Apr 2016 20:50:38 +0000 (20:50 +0000)]
Merge "Don'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
Dimitry Ivanov [Tue, 19 Apr 2016 17:07:20 +0000 (17:07 +0000)]
Merge "Make 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
Shinichiro Hamaji [Tue, 19 Apr 2016 09:41:27 +0000 (18:41 +0900)]
Add input dependencies to .img targets
They should have build/tools/releasetools/*.py as their
prerequisites.
Bug:
27954979
Change-Id: I51595fc91caaad38be3e47befb5df7ac2683bf14
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"
Shinichiro Hamaji [Tue, 19 Apr 2016 07:17:55 +0000 (16:17 +0900)]
Add normalize_path.py to prerequisites
Bug:
27954979
Change-Id: I1e22eb4f42a8cb348ce1101e207e239bc5aa7976
Yabin Cui [Tue, 19 Apr 2016 03:42:04 +0000 (03:42 +0000)]
Merge "Revert "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
Yabin Cui [Tue, 19 Apr 2016 02:52:21 +0000 (02:52 +0000)]
Merge "Use strip mode mini-debug-info by default."
Treehugger Robot [Mon, 18 Apr 2016 23:14:50 +0000 (23:14 +0000)]
Merge "Move 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
Nick Kralevich [Mon, 18 Apr 2016 22:17:16 +0000 (22:17 +0000)]
Merge "Address 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
Treehugger Robot [Mon, 18 Apr 2016 20:35:27 +0000 (20:35 +0000)]
Merge "fs_config: include both oem ranges"
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."
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
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
Yabin Cui [Sat, 16 Apr 2016 00:23:50 +0000 (00:23 +0000)]
Merge "Add 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
Treehugger Robot [Fri, 15 Apr 2016 04:03:42 +0000 (04:03 +0000)]
Merge "Skip 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)
Treehugger Robot [Thu, 14 Apr 2016 23:14:07 +0000 (23:14 +0000)]
Merge "Makefile: 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)
Yohann Roussel [Thu, 14 Apr 2016 21:14:38 +0000 (21:14 +0000)]
Merge "Allow 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
Ying Wang [Thu, 14 Apr 2016 18:49:07 +0000 (18:49 +0000)]
Merge "Reject 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
David Zeuthen [Thu, 14 Apr 2016 16:04:30 +0000 (16:04 +0000)]
Merge "Add support for Brillo partitioning."
Treehugger Robot [Thu, 14 Apr 2016 00:53:39 +0000 (00:53 +0000)]
Merge "releasetools: 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)
Tianjie Xu [Wed, 13 Apr 2016 21:48:53 +0000 (21:48 +0000)]
Merge "Monotonic 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
Tianjie Xu [Wed, 13 Apr 2016 19:19:03 +0000 (19:19 +0000)]
Merge "Remove post-install verification"
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
Shinichiro Hamaji [Wed, 13 Apr 2016 05:07:00 +0000 (05:07 +0000)]
Merge "Always use ensure_start to ensure goma's daemon runs"
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
Treehugger Robot [Tue, 12 Apr 2016 21:24:51 +0000 (21:24 +0000)]
Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS"
Tao Bao [Tue, 12 Apr 2016 16:32:32 +0000 (16:32 +0000)]
Merge "releasetools: Use fixed timestamp in otacerts.zip."
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
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)
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
Andreas Gampe [Tue, 12 Apr 2016 02:46:58 +0000 (02:46 +0000)]
Merge "Build: 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
Sebastien Hertz [Mon, 11 Apr 2016 14:31:35 +0000 (14:31 +0000)]
Merge "Update code coverage filtering"
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>
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
Shinichiro Hamaji [Fri, 8 Apr 2016 04:45:23 +0000 (04:45 +0000)]
Merge "Add jack's argument files to prerequisites"
Ying Wang [Thu, 7 Apr 2016 21:51:21 +0000 (21:51 +0000)]
Merge "Correct usage message for build_image.py"
Alex Klyubin [Thu, 7 Apr 2016 19:56:03 +0000 (19:56 +0000)]
Merge "Remove support for DSA with SHA-512 from v2 signing."
Colin Cross [Thu, 7 Apr 2016 18:03:59 +0000 (18:03 +0000)]
Merge "makeparallel: reset make's unlimited stack"
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
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
Shinichiro Hamaji [Thu, 7 Apr 2016 03:48:31 +0000 (03:48 +0000)]
Merge "Add Bison binary and its data to prerequisite"
Shinichiro Hamaji [Thu, 7 Apr 2016 03:48:02 +0000 (03:48 +0000)]
Merge "Fix dependencies of protoc with nanopb-c plugin"
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
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
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
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
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
Dan Albert [Tue, 5 Apr 2016 18:51:16 +0000 (18:51 +0000)]
Merge "Remove mips special case."
Sebastien Hertz [Tue, 5 Apr 2016 09:20:21 +0000 (09:20 +0000)]
Merge "Fix code coverage for apps"
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
Mark Salyzyn [Mon, 4 Apr 2016 22:37:33 +0000 (22:37 +0000)]
Merge "fs_config: introduce TARGET_FS_CONFIG_GEN"
Sen Jiang [Mon, 4 Apr 2016 21:43:11 +0000 (21:43 +0000)]
Merge "Remove libdivsufsort shared library from otatools."
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."
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
Dan Albert [Mon, 4 Apr 2016 20:27:42 +0000 (20:27 +0000)]
Merge "Update NDK libc++ header paths."
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
Mohamad Ayyash [Mon, 4 Apr 2016 19:42:25 +0000 (19:42 +0000)]
Merge "Always 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>
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
Miao Wang [Fri, 1 Apr 2016 20:22:41 +0000 (20:22 +0000)]
Merge "[RenderScript] Update the build rules for x86_64 support lib."
Chih-hung Hsieh [Fri, 1 Apr 2016 16:15:57 +0000 (16:15 +0000)]
Merge "Recognize 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
Dan Albert [Thu, 31 Mar 2016 23:11:26 +0000 (23:11 +0000)]
Merge "Add LOCAL_NDK_VERSION."
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)
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
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
Ying Wang [Thu, 31 Mar 2016 16:52:49 +0000 (16:52 +0000)]
Merge "Remove support of disabling Jack."
Ying Wang [Thu, 31 Mar 2016 16:46:18 +0000 (16:46 +0000)]
Merge "Replace $(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
Dan Willemsen [Wed, 30 Mar 2016 21:24:08 +0000 (21:24 +0000)]
Merge "Remove extraneous /"
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
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
Ying Wang [Wed, 30 Mar 2016 16:56:54 +0000 (16:56 +0000)]
Merge "Keep emma files for host rules"
Chih-hung Hsieh [Wed, 30 Mar 2016 16:12:34 +0000 (16:12 +0000)]
Merge "Recognize Clang-Tidy warning messages."
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