OSDN Git Service
Dan Willemsen [Mon, 21 Mar 2016 21:21:02 +0000 (21:21 +0000)]
Merge "Always run Soong"
am:
a800b9a
* commit '
a800b9a83a9f855a53723880f2d71fa107ea1028':
Always run Soong
Dan Willemsen [Mon, 21 Mar 2016 21:09:40 +0000 (21:09 +0000)]
Merge "Always run Soong"
Pirama Arumuga Nainar [Mon, 21 Mar 2016 19:40:05 +0000 (19:40 +0000)]
Pirama Arumuga Nainar [Mon, 21 Mar 2016 19:40:05 +0000 (19:40 +0000)]
Update RenderScript build rules for rebase to LLVM r256229
am:
27b18f5
* commit '
27b18f5c950d3c4d16f26bd693df29912b76b8fb':
Update RenderScript build rules for rebase to LLVM r256229
David Zeuthen [Mon, 21 Mar 2016 15:55:23 +0000 (15:55 +0000)]
Merge "Add support for Brillo Verified Boot."
am:
003bec4
* commit '
003bec431cc133134bbb29040f6c01d3f608e6ee':
Add support for Brillo Verified Boot.
David Zeuthen [Mon, 21 Mar 2016 15:46:29 +0000 (15:46 +0000)]
Merge "Add support for Brillo Verified Boot."
Pirama Arumuga Nainar [Thu, 17 Mar 2016 18:06:51 +0000 (11:06 -0700)]
Switch to clang-
2690385
http://b/
26987366
(cherry picked from commit
760aec5fdfa60354373ed805a93616c34ded91ff)
Change-Id: Ib26fa27c214b67024ad43a1e0b1db277d7c7f929
Pirama Arumuga Nainar [Thu, 17 Mar 2016 18:04:37 +0000 (11:04 -0700)]
Update RenderScript build rules for rebase to LLVM r256229
http://b/
26987366
- Use clang-
2690385 to build RenderScript toolchain.
- Use armv7-linux-androideabi as the triple used to build RenderScript
runtime libraries.
(cherry picked from commit
41f4b242e38c6f95fff133cfb6f07691f56f672b)
Change-Id: I50751f410a2f7c83532cec9b96c50d9afe1224c1
Pirama Arumuga Nainar [Fri, 18 Mar 2016 22:05:42 +0000 (22:05 +0000)]
Merge changes from topic \'rebase_r256229\'
am:
6721b1d
* commit '
6721b1d185f57aa12169fe19bd1dc6830a7edeac':
Switch to clang-
2690385
Update RenderScript build rules for rebase to LLVM r256229
Pirama Arumuga Nainar [Fri, 18 Mar 2016 21:54:50 +0000 (21:54 +0000)]
Merge changes from topic 'rebase_r256229'
* changes:
Switch to clang-
2690385
Update RenderScript build rules for rebase to LLVM r256229
David Zeuthen [Fri, 29 Jan 2016 21:59:17 +0000 (16:59 -0500)]
Add support for Brillo Verified Boot.
The following variables are introduced
BOARD_BVB_ENABLE: can be set to true to build boot.img and system.img
files compatible with Brillo Verfied Boot.
BOARD_BVB_ROLLBACK_INDEX: can be set to an integer to use for the
rollback index.
BOARD_BVB_KEY_PATH, BOARD_BVB_ALGORITHM: If set, the former must be a
path to the private key used to sign the boot image and the latter must
be the algorithm to use. If unset, a test-key stored in the tree will
be used.
BOARD_BVB_MAKE_BOOT_IMAGE_ARGS: Extra options to pass to 'bvbtool
make_boot_image'.
BOARD_BVB_SIGN_BOOT_IMAGE_ARGS: Extra options to pass to 'bvbtool
sign_boot_image'.
BOARD_BVB_ADD_IMAGE_HASHES_ARGS: Extra options to pass to 'bvbtool
add_image_hashes'.
BOARD_CUSTOM_BVBTOOL: Can be set to specify what bvbtool program to
use.
The existing BOARD_KERNEL_CMDLINE variable is also used, as are existing
kernel and initrd-related variables. Therefore, simply adding
BOARD_BVB_ENABLE := true
to an existing Makefile should do the trick.
Bug:
26185038
TEST=Added 'BOARD_BVB_ENABLE := true' to hardware/bsp/intel/soc/edison/soc.mk
and built an image and then ran bvbtool's info_boot_image and
info_image_hashes commands on the resulting boot.img and system.img
files and verified that the information was correct. Also ran 'm dist'
and verified that the boot.img and system.img files in the resulting
target_files.zip file had similar information.
Change-Id: I08045ed8b0cbddc7c3acdd3a6f2c4bb75cb44bbc
Ying Wang [Fri, 18 Mar 2016 18:52:30 +0000 (18:52 +0000)]
Merge "Enable -Werror on zipalign"
am:
de005f0 -s ours
* commit '
de005f0c85e5d8262b95d40ed58bf8f9cdca4d38':
Enable -Werror on zipalign
Ying Wang [Fri, 18 Mar 2016 17:37:17 +0000 (17:37 +0000)]
Merge "Enable -Werror on zipalign"
Ying Wang [Fri, 18 Mar 2016 17:04:07 +0000 (10:04 -0700)]
Enable -Werror on zipalign
And fix the last warning to enable this flag.
Bug:
27695718
Change-Id: I70eb9c87530a9b982fbe83abea706908f0ce0356
Yohann Roussel [Fri, 18 Mar 2016 17:01:54 +0000 (17:01 +0000)]
Remove rules for building dex with dx
am:
2ae244c
* commit '
2ae244c5784b8fe853d040a0ed54742fb8825979':
Remove rules for building dex with dx
Yohann Roussel [Wed, 16 Mar 2016 09:33:02 +0000 (10:33 +0100)]
Remove rules for building dex with dx
This is just to ensure no dex file is built with dx any more, cleaning
of the build rules from Jack optionality is still to be done.
Bug:
27218410
(cherry picked from commit
22313f2b2a4aba8d284be4324233379d95886e23)
Change-Id: I1e7f2f5dcc7f95a44f5ebf2e4ba99931ff3ba014
Yohann Roussel [Fri, 18 Mar 2016 13:59:10 +0000 (13:59 +0000)]
Merge "Remove rules for building dex with dx"
am:
a978779
* commit '
a978779668cb6dd8791348dc701bf154f80164af':
Remove rules for building dex with dx
Yohann Roussel [Fri, 18 Mar 2016 13:50:55 +0000 (13:50 +0000)]
Merge "Remove rules for building dex with dx"
Przemyslaw Szczepaniak [Fri, 18 Mar 2016 13:15:31 +0000 (13:15 +0000)]
Merge "Add java.util.stream to whitelisted packages" into nyc-dev
am:
1a662f4
* commit '
1a662f48c3e18583fd8cba2dade94aa44e5f6e9b':
Add java.util.stream to whitelisted packages
Przemyslaw Szczepaniak [Fri, 18 Mar 2016 13:08:58 +0000 (13:08 +0000)]
Merge "Add java.util.stream to whitelisted packages" into nyc-dev
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 13:45:23 +0000 (13:45 +0000)]
Add java.util.stream to whitelisted packages
Bug:
27692239
Change-Id: I50e671222efc415fb930e5493f1943c5b8f6a71c
(cherry picked from commit
fe606f0939ef59a52d013d9398133437b8edb5dd)
Przemyslaw Szczepaniak [Fri, 18 Mar 2016 12:44:23 +0000 (12:44 +0000)]
Merge "Allow for 5400 words in dump-words-to-file" into nyc-dev
am:
1b21b85
* commit '
1b21b85b119796d9007e874af99948a803805397':
Allow for 5400 words in dump-words-to-file
Przemyslaw Szczepaniak [Fri, 18 Mar 2016 12:39:45 +0000 (12:39 +0000)]
Merge "Allow for 5400 words in dump-words-to-file" into nyc-dev
Yohann Roussel [Fri, 18 Mar 2016 12:28:01 +0000 (12:28 +0000)]
Remove JILL, JACK_JAR and JILL_JAR
am:
29b1afe
* commit '
29b1afee9e0e2634df2f2a7790d3100d24a3bfb4':
Remove JILL, JACK_JAR and JILL_JAR
Przemyslaw Szczepaniak [Wed, 24 Feb 2016 12:07:21 +0000 (12:07 +0000)]
Allow for 5400 words in dump-words-to-file
After adding java.util.stream, doc-comment-check target
started to fail due to "Too many words" while
generating out/target/common/docs/doc-comment-check-timestamp.rsp
This change extends number of dumped words to 5400.
Bug:
27692239
Change-Id: Ifa75cada7b90c5737fc7a1d10325f3a49a2238ac
Yohann Roussel [Thu, 17 Mar 2016 11:02:27 +0000 (12:02 +0100)]
Remove JILL, JACK_JAR and JILL_JAR
Also ensure that sdk.atree can find jack.jar and jill.jar from prebuilt.
Bug:
27372042
(cherry picked from commit
233584bb806202364544f964b63561a7350fdc97)
Change-Id: Ie266104e51c09fa21ccb09c1f27ad7068472965c
Yohann Roussel [Fri, 18 Mar 2016 09:12:27 +0000 (10:12 +0100)]
resolve merge conflicts of
c8cfac9 to nyc-dev-plus-aosp
Change-Id: I77317dcaaa4154d6649b36b215df1474721a6503
Yohann Roussel [Fri, 18 Mar 2016 08:54:29 +0000 (08:54 +0000)]
Merge "Remove JILL, JACK_JAR and JILL_JAR"
Joe Onorato [Fri, 18 Mar 2016 01:11:34 +0000 (01:11 +0000)]
Merge "Also turn down the logging for dex2oat on the boot image" into nyc-dev
am:
f7cadb8
* commit '
f7cadb8cfd5bf0393d14029a5678df38b63d963b':
Also turn down the logging for dex2oat on the boot image
Joe Onorato [Fri, 18 Mar 2016 01:06:38 +0000 (01:06 +0000)]
Merge "Also turn down the logging for dex2oat on the boot image" into nyc-dev
Zach Jang [Fri, 18 Mar 2016 00:27:54 +0000 (00:27 +0000)]
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am:
7a498ba am:
cdbccfd am:
5b24724 am:
592d1c5 am:
bbf3687 am:
b294912 am:
d35bff2
am:
569eec0
* commit '
569eec09f557c1b87e288661ef99df71e35cba26':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
Zach Jang [Fri, 18 Mar 2016 00:25:42 +0000 (00:25 +0000)]
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am:
7a498ba am:
cdbccfd am:
5b24724 am:
592d1c5 am:
bbf3687 am:
b294912
am:
d35bff2
* commit '
d35bff2b9a370bcefd82b0ff0960d90678c7942f':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
Zach Jang [Fri, 18 Mar 2016 00:22:40 +0000 (00:22 +0000)]
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am:
7a498ba am:
cdbccfd am:
5b24724 am:
592d1c5 am:
bbf3687
am:
b294912
* commit '
b29491287c683eaa53f567745e3935fb88f91b2f':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
Zach Jang [Fri, 18 Mar 2016 00:20:22 +0000 (00:20 +0000)]
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am:
7a498ba am:
cdbccfd am:
5b24724 am:
592d1c5
am:
bbf3687
* commit '
bbf3687eb83878bbba380799c9f25af1b227bee6':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
Zach Jang [Fri, 18 Mar 2016 00:18:01 +0000 (00:18 +0000)]
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am:
7a498ba am:
cdbccfd am:
5b24724
am:
592d1c5
* commit '
592d1c5a46b95015ec831febc953b17b721383e9':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
Zach Jang [Fri, 18 Mar 2016 00:15:39 +0000 (00:15 +0000)]
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am:
7a498ba am:
cdbccfd
am:
5b24724
* commit '
5b24724ccf81ebbcfd20cebcb9f024c8fed3b5f2':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
Zach Jang [Fri, 18 Mar 2016 00:13:25 +0000 (00:13 +0000)]
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am:
7a498ba
am:
cdbccfd
* commit '
cdbccfda83da86eb8fd8007cc6c6ec2e59ad4223':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
Zach Jang [Fri, 18 Mar 2016 00:10:53 +0000 (00:10 +0000)]
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
am:
7a498ba
* commit '
7a498bafff136f1996042c6794ababcaff11d600':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
Zach Jang [Fri, 18 Mar 2016 00:04:32 +0000 (17:04 -0700)]
Updating Security Patch String to: 2016-03-18
- March 2016 OTA v2
b/
27724091
Change-Id: If448a426d78388208e15254ef30b42873a729647
Dimitry Ivanov [Thu, 17 Mar 2016 23:00:54 +0000 (23:00 +0000)]
Merge "Add config file listing public native libraries"
am:
5fb5fd1
* commit '
5fb5fd190d14426caf05fd3f83a4b271fb12fcb1':
Add config file listing public native libraries
Ying Wang [Thu, 17 Mar 2016 22:55:45 +0000 (22:55 +0000)]
Merge "Fix compilation warning."
am:
5af0991
* commit '
5af0991bfce1695818c76ef3db2c36cc609f4980':
Fix compilation warning.
Dimitry Ivanov [Thu, 17 Mar 2016 22:53:57 +0000 (22:53 +0000)]
Merge "Add config file listing public native libraries"
Ying Wang [Thu, 17 Mar 2016 22:44:28 +0000 (22:44 +0000)]
Merge "Fix compilation warning."
Ying Wang [Thu, 17 Mar 2016 21:44:42 +0000 (14:44 -0700)]
Fix compilation warning.
Fix compilation warning:
" destination for this 'memcpy' call is a pointer to dynamic class
'CentralDirEntry'; vtable pointer will be overwritten"
by removing unnecessary virtual desctructor.
Bug:
27695718
Change-Id: Id3c451f82374f2232176115b7bc3291ac4275c00
Pirama Arumuga Nainar [Thu, 17 Mar 2016 18:06:51 +0000 (11:06 -0700)]
Switch to clang-
2690385
http://b/
26987366
Change-Id: I1226f24b50319e321ea538362b2f26fcd227ca39
Pirama Arumuga Nainar [Thu, 17 Mar 2016 18:04:37 +0000 (11:04 -0700)]
Update RenderScript build rules for rebase to LLVM r256229
http://b/
26987366
- Use clang-
2690385 to build RenderScript toolchain.
- Use armv7-linux-androideabi as the triple used to build RenderScript
runtime libraries.
Change-Id: I582e8b25bbc38b101a2e765028ed61edbce7bdc2
Sen Jiang [Thu, 17 Mar 2016 19:53:04 +0000 (19:53 +0000)]
Merge "Add zlib_fingerprint to target_files.zip"
am:
4e9a86f
* commit '
4e9a86fb6e9a9f31c505dfa68285067964f70a8f':
Add zlib_fingerprint to target_files.zip
Sen Jiang [Thu, 17 Mar 2016 19:47:42 +0000 (19:47 +0000)]
Merge "Add zlib_fingerprint to target_files.zip"
Dimitry Ivanov [Thu, 17 Mar 2016 18:28:16 +0000 (18:28 +0000)]
Add config file listing public native libraries
am:
795132d
* commit '
795132dccd954f5879b92b6c3a5137ce9b278ea3':
Add config file listing public native libraries
Dimitry Ivanov [Wed, 16 Mar 2016 22:06:06 +0000 (15:06 -0700)]
Add config file listing public native libraries
This file contains list of libraries that should be directly or
indirectly accessible to apps for the platform. Note that this
file is not device specific but rather device class specific.
Bug: http://b/
27546414
Change-Id: Ica2e6c5cedac6e4af9bd78addaa512b2fa272d64
(cherry picked from commit
795132dccd954f5879b92b6c3a5137ce9b278ea3)
Joe Onorato [Thu, 17 Mar 2016 17:12:36 +0000 (10:12 -0700)]
Also turn down the logging for dex2oat on the boot image
Bug:
27499257
Change-Id: I190ce72b44e49451dab44902e2ca33dd5c2815ce
Chih-Hung Hsieh [Thu, 17 Mar 2016 16:36:15 +0000 (16:36 +0000)]
Merge "Link in ASAN library if my_global_santitize is set."
am:
9d5fb14
* commit '
9d5fb14b2d551e522c51f78361b77653191c8c91':
Link in ASAN library if my_global_santitize is set.
Chih-hung Hsieh [Thu, 17 Mar 2016 16:26:31 +0000 (16:26 +0000)]
Merge "Link in ASAN library if my_global_santitize is set."
Chih-Hung Hsieh [Thu, 17 Mar 2016 16:08:07 +0000 (16:08 +0000)]
Merge "Classify more warning patterns."
am:
b569c06
* commit '
b569c060360109d9450ea269fe7b2a85bcf3fc17':
Classify more warning patterns.
Chih-hung Hsieh [Thu, 17 Mar 2016 16:01:27 +0000 (16:01 +0000)]
Merge "Classify more warning patterns."
Yohann Roussel [Thu, 17 Mar 2016 11:02:27 +0000 (12:02 +0100)]
Remove JILL, JACK_JAR and JILL_JAR
Also ensure that sdk.atree can find jack.jar and jill.jar from prebuilt.
Bug:
27372042
Change-Id: Ie266104e51c09fa21ccb09c1f27ad7068472965c
Chih-Hung Hsieh [Wed, 16 Mar 2016 19:18:16 +0000 (12:18 -0700)]
Classify more warning patterns.
Some warnings are from clang static analyzer
and they do not have compiler -W flag.
BUG:
27698849
Change-Id: I3d1fc9c2d6c60100e87f8ea201d3f8314370fccd
Dimitry Ivanov [Wed, 16 Mar 2016 22:06:06 +0000 (15:06 -0700)]
Add config file listing public native libraries
This file contains list of libraries that should be directly or
indirectly accessible to apps for the platform. Note that this
file is not device specific but rather device class specific.
Bug: http://b/
27546414
Change-Id: Ica2e6c5cedac6e4af9bd78addaa512b2fa272d64
Dan Willemsen [Wed, 16 Mar 2016 20:20:33 +0000 (20:20 +0000)]
Merge "Add SOONG_ALLOW_MISSING_DEPENDENCIES"
am:
b6d813c
* commit '
b6d813ce0ac661e4055fcbcd36eb259d521412f3':
Add SOONG_ALLOW_MISSING_DEPENDENCIES
Dan Willemsen [Wed, 16 Mar 2016 20:14:27 +0000 (20:14 +0000)]
Merge "Add SOONG_ALLOW_MISSING_DEPENDENCIES"
Yohann Roussel [Wed, 16 Mar 2016 20:11:22 +0000 (20:11 +0000)]
Merge "Fix jack min sdk version for ub branches"
am:
1d09e1d -s ours
* commit '
1d09e1d8e268b0218a569572a82a7079c84e972c':
Fix jack min sdk version for ub branches
Yohann Roussel [Wed, 16 Mar 2016 20:00:19 +0000 (20:00 +0000)]
Merge "Fix jack min sdk version for ub branches"
Dan Willemsen [Wed, 16 Mar 2016 18:12:41 +0000 (11:12 -0700)]
Add SOONG_ALLOW_MISSING_DEPENDENCIES
Split out Soong's missing dependency option from Unbundled_build. There
are builds other than unbundled builds that don't have a full platform
tree (AOSP llvm branch is one example).
When this is set to true, Soong will defer the error for missing
dependencies until a module is attempted to be built, instead of when
it is reading and generating the build rules. So for platform builds it
will still fail early if something is missing.
Change-Id: I56cb881ff55f5928b77cddc0d67086c3d37e43d7
Tao Bao [Wed, 16 Mar 2016 19:21:49 +0000 (19:21 +0000)]
Merge "Revert "Revert "releasetools: Support OTAs that have OEM properties changes."""
am:
fd52990
* commit '
fd529902f8731b028fac38b0c31a2c6d170c2726':
Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""
Tao Bao [Wed, 16 Mar 2016 19:14:05 +0000 (19:14 +0000)]
Merge "Revert "Revert "releasetools: Support OTAs that have OEM properties changes."""
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 18:55:14 +0000 (18:55 +0000)]
Merge "Add java.util.stream to whitelisted packages"
am:
44fb624
* commit '
44fb6241bed675b959dabf0732b97bff9e99795a':
Add java.util.stream to whitelisted packages
Sen Jiang [Tue, 8 Mar 2016 00:51:01 +0000 (16:51 -0800)]
Add zlib_fingerprint to target_files.zip
Test: make dist on edison-userdebug
Bug:
27156099
Change-Id: I4ba9095ecc5bb1730b8d0ba2d56d20fdbff3acaa
Yohann Roussel [Wed, 16 Mar 2016 16:18:32 +0000 (17:18 +0100)]
Fix jack min sdk version for ub branches
Bug:
27371864
(cherry picked from commit
d6101b678688bce96d67f8d945537f405f648194)
Change-Id: Idd926f5667fbe4275f8f1d80733b8c4471570874
Yohann Roussel [Wed, 16 Mar 2016 16:45:11 +0000 (16:45 +0000)]
Fix jack min sdk version for ub branches
am:
d6101b6
* commit '
d6101b678688bce96d67f8d945537f405f648194':
Fix jack min sdk version for ub branches
Yohann Roussel [Wed, 16 Mar 2016 16:33:38 +0000 (17:33 +0100)]
resolve merge conflicts of
63de777 to nyc-dev-plus-aosp
Change-Id: I5dadd6f7bbf494665f9deb0cfafcce65530825d0
Yohann Roussel [Wed, 16 Mar 2016 16:18:32 +0000 (17:18 +0100)]
Fix jack min sdk version for ub branches
Bug:
27371864
Change-Id: Idd926f5667fbe4275f8f1d80733b8c4471570874
Yohann Roussel [Wed, 16 Mar 2016 16:03:01 +0000 (16:03 +0000)]
Merge "Inform Jack of the min sdk"
am:
ab64f89 -s ours
* commit '
ab64f89bd63c2d0dc48cc428284fbdeedd107833':
Inform Jack of the min sdk
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 15:52:57 +0000 (15:52 +0000)]
Merge "Add java.util.stream to whitelisted packages"
Yohann Roussel [Wed, 16 Mar 2016 15:41:58 +0000 (15:41 +0000)]
Merge "Inform Jack of the min sdk" into nyc-dev
Yohann Roussel [Wed, 9 Mar 2016 16:19:58 +0000 (17:19 +0100)]
Inform Jack of the min sdk
Set Jack min sdk according to LOCAL_SDK_VERSION. Gives Jack current
version when LOCAL_SDK_VERSION is not available.
Bug:
27371864
(cherry picked from commit
c6383d6ec665a0d0c7c866890845c5735a298b6b)
Change-Id: Ieba0219494f29d2737d2ca234317c3af7e5e72c8
Yohann Roussel [Wed, 16 Mar 2016 14:19:04 +0000 (14:19 +0000)]
Merge "Inform Jack of the min sdk"
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 13:45:23 +0000 (13:45 +0000)]
Add java.util.stream to whitelisted packages
Bug:
27692239
Change-Id: I50e671222efc415fb930e5493f1943c5b8f6a71c
Yohann Roussel [Wed, 9 Mar 2016 16:19:58 +0000 (17:19 +0100)]
Inform Jack of the min sdk
Set Jack min sdk according to LOCAL_SDK_VERSION. Gives Jack current
version when LOCAL_SDK_VERSION is not available.
Bug:
27371864
Change-Id: I5db233fe09aed0fae37fe9a92658bc8f24b86cdf
Yohann Roussel [Wed, 16 Mar 2016 09:33:02 +0000 (10:33 +0100)]
Remove rules for building dex with dx
This is just to ensure no dex file is built with dx any more, cleaning
of the build rules from Jack optionality is still to be done.
Bug:
27218410
Change-Id: Iea2c66802b6c64c52690ad9d6d487bdce5f50b79
Sen Jiang [Wed, 16 Mar 2016 04:12:44 +0000 (04:12 +0000)]
Merge "Revert "Add zlib_fingerprint to target_files.zip""
am:
d2ca52d
* commit '
d2ca52df8c7ac08c3191118fa8606816d20ac119':
Revert "Add zlib_fingerprint to target_files.zip"
Sen Jiang [Wed, 16 Mar 2016 04:04:41 +0000 (04:04 +0000)]
Merge "Revert "Add zlib_fingerprint to target_files.zip""
Sen Jiang [Wed, 16 Mar 2016 03:38:29 +0000 (03:38 +0000)]
Revert "Add zlib_fingerprint to target_files.zip"
This reverts commit
d8c715bf34ca6f637d6b15c8cd50d666137d05a3.
Change-Id: Ie0c3c5b2db89fe076d678b67f013c20e836d825f
Sen Jiang [Wed, 16 Mar 2016 03:06:32 +0000 (03:06 +0000)]
Merge "Add zlib_fingerprint to target_files.zip"
am:
65aa976
* commit '
65aa9761539736e4ab5622d0cff5d8160cc620f8':
Add zlib_fingerprint to target_files.zip
Sen Jiang [Wed, 16 Mar 2016 02:59:36 +0000 (02:59 +0000)]
Merge "Add zlib_fingerprint to target_files.zip"
Ying Wang [Tue, 15 Mar 2016 23:58:51 +0000 (16:58 -0700)]
Fix error introduced in merge commit
c9a19779a219.
Change-Id: I0f49519f4c9dd16052e85a7b820e1ed8f4300380
Chih-Hung Hsieh [Wed, 9 Mar 2016 22:54:55 +0000 (14:54 -0800)]
Link in ASAN library if my_global_santitize is set.
* When my_global_santitize is set and requires ASAN,
link with ASAN library even when local module is not
instrumented with ASAN, unless the local module is
the ASAN library itself.
* Add -Wl,--as-needed to my_ldflags for shared libraries
so that unneeded ASAN library would not become
a dependent of the built .so file.
* Change shared file and executable file link argument order
so that -Wl flags will have effect on linked-in libraries.
* Remove unused ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES.
BUG:
27614834
Change-Id: I4eda6003f1f24e498cba91c043dbe1fabe522686
Shinichiro Hamaji [Tue, 15 Mar 2016 23:06:31 +0000 (23:06 +0000)]
Merge "Replace last -includes by .KATI_DEPFILE"
am:
c26ec724b8
* commit '
c26ec724b8b4d356573901f96e1a8ce728bdd1b1':
Replace last -includes by .KATI_DEPFILE
Shinichiro Hamaji [Tue, 15 Mar 2016 23:00:11 +0000 (23:00 +0000)]
Merge "Replace last -includes by .KATI_DEPFILE"
Ying Wang [Tue, 15 Mar 2016 21:40:33 +0000 (14:40 -0700)]
resolve merge conflicts of
fc16dca602 to nyc-dev-plus-aosp
Now we can remove all uses of $(ACP) in prebuilt_internal.mk.
Change-Id: I07a449f3acca9b56c6a387ff8ca1535d19c872d1
Shinichiro Hamaji [Tue, 15 Mar 2016 21:40:04 +0000 (06:40 +0900)]
Replace last -includes by .KATI_DEPFILE
There was a typo in binary.mk. compile-dotdot-XXX-file in
definitions.mk was also using -include.
Bug:
26839129
Change-Id: I4a0145fb70413998cc65d30d2efcd68af07b4800
Ying Wang [Tue, 15 Mar 2016 21:23:49 +0000 (21:23 +0000)]
Merge "Rebuild odex files in PDK fusion build." into nyc-dev
Ying Wang [Tue, 15 Mar 2016 21:13:48 +0000 (21:13 +0000)]
Merge "Fix warning of "overriding commands for target ...boot.oat"." into nyc-dev
am:
234985a127
* commit '
234985a1273060f00d11241e4d9e107ba900fdb3':
Fix warning of "overriding commands for target ...boot.oat".
Ying Wang [Tue, 15 Mar 2016 20:59:25 +0000 (20:59 +0000)]
Merge "Fix warning of "overriding commands for target ...boot.oat"." into nyc-dev
Tao Bao [Tue, 15 Mar 2016 20:20:19 +0000 (13:20 -0700)]
Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""
This CL fixes the bug in [1] (copy-paste error) and reenables it.
We need to handle a special case that an OTA goes from a source build
without OEM properties to a target build with those properties (or vice
versa). Add support in OTA scripts to deal the case properly, by a)
using two oem_props variables to handle source and target builds
respectively; b) adjusting the fingerprint/thumbprint assertions to
allow a mix of both.
[1] commit
c086370440bb32501da427718a7313f12ec2c841
Change-Id: I98118d77d5a0ff694fa1ee33602b5ee5e048599b
Sami Tolvanen [Tue, 15 Mar 2016 19:31:27 +0000 (19:31 +0000)]
Revert "Revert "build: pass version and patch level to mkbootimg""
am:
a8c37be285
* commit '
a8c37be28598c6bdd920af4c306a29db013b68e7':
Revert "Revert "build: pass version and patch level to mkbootimg""
Ying Wang [Tue, 15 Mar 2016 19:13:56 +0000 (12:13 -0700)]
Fix warning of "overriding commands for target ...boot.oat".
There seems to be bug in Kati that when we write it as:
LIBART_TARGET_BOOT_ART_EXTRA_FILES += boot.oat $(patsubst
%.art,%.oat,$(LIBART_TARGET_BOOT_ART_EXTRA_FILES))
boot.oat ends up in the value twice.
This works around the bug, filed as bug/
27676615.
Bug:
27546601
Change-Id: Ifc330280496083a4c817e53bc5c77c86e48a2426
Tao Bao [Tue, 15 Mar 2016 19:24:21 +0000 (19:24 +0000)]
Merge "Revert "releasetools: Support OTAs that have OEM properties changes.""
am:
3c37889299
* commit '
3c37889299b7ab8df676fed7b8157484a7e5315a':
Revert "releasetools: Support OTAs that have OEM properties changes."
Tao Bao [Tue, 15 Mar 2016 19:16:32 +0000 (19:16 +0000)]
Merge "Revert "releasetools: Support OTAs that have OEM properties changes.""
Tao Bao [Tue, 15 Mar 2016 19:16:18 +0000 (19:16 +0000)]
Revert "releasetools: Support OTAs that have OEM properties changes."
Broke some builds.
This reverts commit
c086370440bb32501da427718a7313f12ec2c841.
Change-Id: If07006db412fea6c04f8698776a2ab418125a469
Tao Bao [Tue, 15 Mar 2016 18:43:03 +0000 (18:43 +0000)]
Merge "releasetools: Support OTAs that have OEM properties changes."
am:
61cebe79f4
* commit '
61cebe79f4949217181431fb347b7577d74ecc75':
releasetools: Support OTAs that have OEM properties changes.
OSDN Git Service
