OSDN Git Service
Ying Wang [Wed, 20 Apr 2016 21:03:35 +0000 (21:03 +0000)]
Merge "Allow to build native tests for translation arch only."
am:
c24740f
* commit '
c24740fdc874b5163fd02eb36811ff750d2acff8':
Allow to build native tests for translation arch only.
Change-Id: I36f222f6b69737f280fac983f62a201a30f255b9
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)
Colin Cross [Wed, 20 Apr 2016 12:15:03 +0000 (12:15 +0000)]
Merge "Make jack_check_timestamp depend on setup-jack-server"
am:
e982d92
* commit '
e982d92bb740e19a62566eb303c9abaccf475442':
Make jack_check_timestamp depend on setup-jack-server
Change-Id: I0a2a37e2e286dff028ea60c5bfead0247c9cbc73
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
Duane Sand [Wed, 20 Apr 2016 04:50:58 +0000 (04:50 +0000)]
Merge "Enable asan/ubsan for mips"
am:
a58cefb
* commit '
a58cefb6834fefe411c0b14782d2e5ad8c148389':
Enable asan/ubsan for mips
Change-Id: I2af83d34fa183a2eecbe4f16e4ff5579d8d8ca3c
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:58:58 +0000 (20:58 +0000)]
Merge "Don\'t reset LOCAL_*MODULE_STEM."
am:
e77e5e7
* commit '
e77e5e7b5ba8991323cd1c421e9076cbe46b2bb3':
Don't reset LOCAL_*MODULE_STEM.
Change-Id: I642dd9ec7a9ba3ae9a4a5f0b3c889fbf22c48353
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
Nikola Veljkovic [Tue, 19 Apr 2016 17:15:19 +0000 (17:15 +0000)]
Merge "Make sure platform libraries are built, regardless of webview.apk"
am:
da7fef6
* commit '
da7fef62aa60da65a9f183cf82c14b6aa7694aff':
Make sure platform libraries are built, regardless of webview.apk
Change-Id: I9cd12ab64852adc6761fd975b8606f08b78bfe1d
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
Neil Fuller [Tue, 19 Apr 2016 08:18:31 +0000 (08:18 +0000)]
Merge "Add core-lambda-stubs to default classpath for target libs compiling using javac"
am:
8c5698d
* commit '
8c5698d220d4eb6bbba965c070d2fb792de6f3c1':
Add core-lambda-stubs to default classpath for target libs compiling using javac
Change-Id: I8b6557aee0c120ea3c63bc0948c1109ca1b9a9e1
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"
Yabin Cui [Tue, 19 Apr 2016 03:48:49 +0000 (03:48 +0000)]
Merge "Revert "Use strip mode mini-debug-info by default.""
am:
b34f69f
* commit '
b34f69f8499fe699edaca8715bed13b884cb9669':
Revert "Use strip mode mini-debug-info by default."
Change-Id: Ie234fc5a11933a3364c34981f110f25f6f0842b8
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:57:41 +0000 (02:57 +0000)]
Merge "Use strip mode mini-debug-info by default."
am:
c7eab6d
* commit '
c7eab6db2743abd98c6a5123c4f8764463547bd6':
Use strip mode mini-debug-info by default.
Change-Id: Ibc7d3304a52b9dcf5573506b6ad5df35ec4ef167
Yabin Cui [Tue, 19 Apr 2016 02:52:21 +0000 (02:52 +0000)]
Merge "Use strip mode mini-debug-info by default."
Nick Kralevich [Mon, 18 Apr 2016 23:22:39 +0000 (23:22 +0000)]
Merge "Move sysfs_writable to emulator specific policy"
am:
821e3fd
* commit '
821e3fd8184dca5c9f42ef7c923ddb772fe3d5c6':
Move sysfs_writable to emulator specific policy
Change-Id: I54e4d7dd9c5aecb1e76d8c502a1e8d66dcbaf905
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:22:40 +0000 (22:22 +0000)]
Merge "Address emulator specific SELinux denials"
am:
35b0d00
* commit '
35b0d00125d4ad9e69b8fc6c1264afd20a1d5028':
Address emulator specific SELinux denials
Change-Id: I8efb0064f532e34a9fee35665a0185e14ed242e0
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
William Roberts [Mon, 18 Apr 2016 20:50:33 +0000 (20:50 +0000)]
Merge "fs_config: include both oem ranges"
am:
27e0d48
* commit '
27e0d48f0be2242655d005d0d37c705d4a8ccf33':
fs_config: include both oem ranges
Change-Id: I3a5c12539e58810e09e2f41277f95c191e1daeaf
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:35:09 +0000 (18:35 +0000)]
Merge "Adding gcc-specific disable of Wattributes in preparation for libcxx rebase."
am:
7984620
* commit '
798462046192ede9e723672016da5f7aa17fc988':
Adding gcc-specific disable of Wattributes in preparation for libcxx rebase.
Change-Id: Ie67479e1157d97f5b42f42b086bdaf31d738e398
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:33:39 +0000 (00:33 +0000)]
Merge "Add strip mode mini-debug-info."
am:
9a02623
* commit '
9a02623eb66519a2b4607daa883607e893f7727f':
Add strip mode mini-debug-info.
Change-Id: Ia856b0af684e62b2d17a4a92015afcb02992f523
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
Tao Bao [Fri, 15 Apr 2016 04:07:16 +0000 (04:07 +0000)]
Merge "Skip verifying the partition with no changed blocks."
am:
44a22a3
* commit '
44a22a34f72936f7006ce50510c2d54d19b5d798':
Skip verifying the partition with no changed blocks.
Change-Id: Id3ef138022f19be23a26cd42868b2395c313acb8
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)
Tao Bao [Thu, 14 Apr 2016 23:22:55 +0000 (23:22 +0000)]
Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip."
am:
8191f12
* commit '
8191f1231dfe45923e8a060635bf7ccbe025a665':
Makefile: Pack squashfs and f2fs tools into otatools.zip.
Change-Id: Ia035b329e08ac6baeb1a48de0bc59ae23771b7c8
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:33:33 +0000 (21:33 +0000)]
Merge "Allow to force min sdk given to Jack"
am:
6f4f2a7
* commit '
6f4f2a77939e8de843a9eb70e92e32c8054d74d5':
Allow to force min sdk given to Jack
Change-Id: I029e852c82cd2fd20739b466917542211397757c
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:58:23 +0000 (18:58 +0000)]
Merge "Reject Google\'s build of JDK."
am:
98f7a5c
* commit '
98f7a5c7446ceae437642934f3e49c870deb8066':
Reject Google's build of JDK.
Change-Id: Ie818a54ea90d960e4b570b96c006e51e32d8b76f
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:16:35 +0000 (16:16 +0000)]
Merge "Add support for Brillo partitioning."
am:
2528968
* commit '
2528968871cb43a775b059a9300a7cd907c3cfce':
Add support for Brillo partitioning.
Change-Id: I64897c61190f0674ec006d3ddf3af4342d9b8970
David Zeuthen [Thu, 14 Apr 2016 16:04:30 +0000 (16:04 +0000)]
Merge "Add support for Brillo partitioning."
Tao Bao [Thu, 14 Apr 2016 01:00:23 +0000 (01:00 +0000)]
Merge "releasetools: Only verify the blocks to be touched."
am:
08d2a64
* commit '
08d2a6450516901a1de69b5b372cefffd4d506b3':
releasetools: Only verify the blocks to be touched.
Change-Id: I0dabfa0ca027c448d34451bdbd5026be318c68d5
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 22:02:46 +0000 (22:02 +0000)]
Merge "Monotonic flag sets incorrectly in rangelib"
am:
323e3d4
* commit '
323e3d4c188b7da2839ca70834d893bfd92d7b3a':
Monotonic flag sets incorrectly in rangelib
Change-Id: I592f61c1069293539df958b26043e29149eb4dda
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:28:00 +0000 (19:28 +0000)]
Merge "Remove post-install verification"
am:
dea8b94
* commit '
dea8b94f98ae14cd5782d4cf628d8cf2736dfd5c':
Remove post-install verification
Change-Id: I95cb2de223bbb1accbbe8c743d5b360e019bde92
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:13:20 +0000 (05:13 +0000)]
Merge "Always use ensure_start to ensure goma\'s daemon runs"
am:
f221cbb
* commit '
f221cbba4255a0ade9a222715bb401c544250939':
Always use ensure_start to ensure goma's daemon runs
Change-Id: I57af0d64742ddf4585cfcc036f53244e0c2d6226
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
Christopher Wiley [Tue, 12 Apr 2016 22:12:07 +0000 (22:12 +0000)]
Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS"
am:
5f3b368
* commit '
5f3b3689af234bf5b16671cc01ae4d14956fac0a':
Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS
Change-Id: I38db1f575907c48355d8e88e52d273bedc3b139a
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:44:34 +0000 (16:44 +0000)]
Merge "releasetools: Use fixed timestamp in otacerts.zip."
am:
7b049f7
* commit '
7b049f715c4dc241ffb23ddee8374742246936de':
releasetools: Use fixed timestamp in otacerts.zip.
Change-Id: I3708511770fb022618592753d9de6ddc0c4df23b
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 03:01:39 +0000 (03:01 +0000)]
Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS"
am:
8a547f1
* commit '
8a547f19b859e06baaf3c9495f3a2fc0eaa5905d':
Build: Add ART_BOOT_IMAGE_EXTRA_ARGS
Change-Id: If44d2747e10e2b549e83c96f1916ca05b9af9d04
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:41:01 +0000 (14:41 +0000)]
Merge "Update code coverage filtering"
am:
cb49804
* commit '
cb49804e06adab2882bbcd15230b188f4977eb5a':
Update code coverage filtering
Change-Id: Ia7f5f6a659cea62553865bb1030bc76e48c99b57
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:55:11 +0000 (04:55 +0000)]
Merge "Add jack\'s argument files to prerequisites"
am:
06dbe19
* commit '
06dbe198b9f50d71bf24b52819110594007b14ae':
Add jack's argument files to prerequisites
Change-Id: Ib95413246000676fc050ee1c1e892dd8ea1b6b3f
Shinichiro Hamaji [Fri, 8 Apr 2016 04:45:23 +0000 (04:45 +0000)]
Merge "Add jack's argument files to prerequisites"
Maria Bornski [Thu, 7 Apr 2016 22:06:17 +0000 (22:06 +0000)]
Merge "Correct usage message for build_image.py"
am:
d63ec28
* commit '
d63ec28bcfa69692b15b76510eb3f74372e10d3f':
Correct usage message for build_image.py
Change-Id: I338b5b675a6bcac87b02f78d448896195f2b6eb7
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 20:07:35 +0000 (20:07 +0000)]
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
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:09:32 +0000 (18:09 +0000)]
Merge "makeparallel: reset make\'s unlimited stack"
am:
a034129
* commit '
a034129176d8821efc2bc8d33e06d9aeb4d3fd16':
makeparallel: reset make's unlimited stack
Change-Id: I6e159629c5fe2441f53e0e2687ab0e0478b68499
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:53:42 +0000 (03:53 +0000)]
Merge "Add Bison binary and its data to prerequisite"
am:
4d69fbf
* commit '
4d69fbf5beeb7f56c878ed8b3286b23521029f74':
Add Bison binary and its data to prerequisite
Change-Id: I5ee7077db82707a4aaa5c7801e8dbc0b564316bb
Shinichiro Hamaji [Thu, 7 Apr 2016 03:53:41 +0000 (03:53 +0000)]
Merge "Fix dependencies of protoc with nanopb-c plugin"
am:
5e2d7f3
* commit '
5e2d7f320423bddb5494cdc1564afa040b98d004':
Fix dependencies of protoc with nanopb-c plugin
Change-Id: Ib343e45fbe14ac06cb0b8205952cbfc3d57b59c6
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:57:31 +0000 (18:57 +0000)]
Merge "Remove mips special case."
am:
a6a6285
* commit '
a6a6285686a753aaedebc2edcbf94f14cb7b6fdf':
Remove mips special case.
Change-Id: I772f6383a3b26c39758be600f194e3f511ec6aa0
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:24:40 +0000 (09:24 +0000)]
Merge "Fix code coverage for apps"
am:
2e8a1fc
* commit '
2e8a1fc96695478be7e0d9efc3f99a305b10930b':
Fix code coverage for apps
Change-Id: I0fc712c82c55079dc88b5d58ff29958e06f4885d
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