OSDN Git Service
Alex Klyubin [Wed, 23 Mar 2016 20:05:27 +0000 (13:05 -0700)]
Fix bug in APK entry alignment.
APK entry alignment logic assumes that input entries have zero-length
comment and extra fields. When the assumption is broken, the logic
silently breaks alignment of output entries. This happens, for
example, when the APK to be signed is already aligned and thus may
contain entries with non-empty extra fields.
Given that APKs are not supposed to use comment and extra fields for
anything useful and given that this signer already discards comment
and extra fields of compressed entries, this change makes the signer
discard comment and extra fields of STORED input entries as well.
This unbreaks the existing alignment logic.
Bug:
27814973
(cherry picked from commit
37a0ecd32935685151f0cfb5a5466e6e360a0b8f)
Change-Id: If2e0df6d3298e9736ef175bb0d9a05d450164c9f
Zach Jang [Wed, 23 Mar 2016 01:10:42 +0000 (01:10 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am:
175b780 am:
274e483 am:
08d9bea am:
6bbd684 am:
f32d07d am:
0cf7987
am:
ae7c301
* commit '
ae7c3010265171b2c215c5a30049320ba50265a7':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Wed, 23 Mar 2016 01:07:14 +0000 (01:07 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am:
175b780 am:
274e483 am:
08d9bea am:
6bbd684 am:
f32d07d
am:
0cf7987
* commit '
0cf7987b7e96d2178fbb028e36992ffb1b589b38':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Wed, 23 Mar 2016 01:03:47 +0000 (01:03 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am:
175b780 am:
274e483 am:
08d9bea am:
6bbd684
am:
f32d07d
* commit '
f32d07dd9328401525e333a34464a1d1f363e524':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Wed, 23 Mar 2016 01:00:15 +0000 (01:00 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am:
175b780 am:
274e483 am:
08d9bea
am:
6bbd684
* commit '
6bbd684464a1307f074e6c173a9147d6e2a626f1':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Wed, 23 Mar 2016 00:56:45 +0000 (00:56 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am:
175b780 am:
274e483
am:
08d9bea
* commit '
08d9bea41096f7c055cf67860a07436da6712b01':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Wed, 23 Mar 2016 00:53:20 +0000 (00:53 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am:
175b780
am:
274e483
* commit '
274e48378f92c711d28876380f34e263159cb81b':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Wed, 23 Mar 2016 00:49:48 +0000 (00:49 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
am:
175b780
* commit '
175b7800f484edceee404abf21973859d5793c0d':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
smain@google.com [Tue, 22 Mar 2016 22:31:19 +0000 (15:31 -0700)]
remove the 'refonly' templates.
no longer needed, as the standard templates now have conditions to handle the reference only design.
bug:
27667787
Change-Id: I7c627ad4cace0bb1c77c494b3052eca3c9609a5c
smain@google.com [Tue, 22 Mar 2016 20:37:59 +0000 (13:37 -0700)]
add the 'reference only' header design as a condition to the normal templates.
also add override for implementation to the to-root link path.
bug:
27667787
Change-Id: I79892ddb7c5053d5325afcd50016c726b34e1361
Pierre Imai [Tue, 22 Mar 2016 02:49:32 +0000 (02:49 +0000)]
Merge "Remove references to deleted dhcpcd" into nyc-dev
Zach Jang [Tue, 22 Mar 2016 01:03:01 +0000 (01:03 +0000)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am:
2b71be5 am:
df28b90 am:
b90d094 am:
fa24625 am:
d7bf980 am:
87582a8
am:
880e914
* commit '
880e914ec6b8ce053ad5b766a2907afaf0c79673':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
Zach Jang [Tue, 22 Mar 2016 00:59:40 +0000 (00:59 +0000)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am:
2b71be5 am:
df28b90 am:
b90d094 am:
fa24625 am:
d7bf980
am:
87582a8
* commit '
87582a8758970cc1178c9c63a7e5f8d97b02aa5d':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
Zach Jang [Tue, 22 Mar 2016 00:56:58 +0000 (00:56 +0000)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am:
2b71be5 am:
df28b90 am:
b90d094 am:
fa24625
am:
d7bf980
* commit '
d7bf9800f4f5fdc83b2ffb163207025459b26b36':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
Zach Jang [Tue, 22 Mar 2016 00:54:07 +0000 (00:54 +0000)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am:
2b71be5 am:
df28b90 am:
b90d094
am:
fa24625
* commit '
fa2462551694090da0d0c941d805165c2e2f6dc2':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
Zach Jang [Tue, 22 Mar 2016 00:51:24 +0000 (00:51 +0000)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am:
2b71be5 am:
df28b90
am:
b90d094
* commit '
b90d09439a5901f78e9eae332f163cdc1ff98f49':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
Zach Jang [Tue, 22 Mar 2016 00:48:45 +0000 (00:48 +0000)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am:
2b71be5
am:
df28b90
* commit '
df28b90a7c45a02c4ba9896ad89f745a48fac7df':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
Zach Jang [Tue, 22 Mar 2016 00:45:26 +0000 (00:45 +0000)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
am:
2b71be5
* commit '
2b71be536b6de0d16d0ae3224d1b00c41bec467e':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
Zach Jang [Tue, 22 Mar 2016 00:42:55 +0000 (17:42 -0700)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
b/
27724973
Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b
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
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
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:39:45 +0000 (12:39 +0000)]
Merge "Allow for 5400 words in dump-words-to-file" into nyc-dev
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
Pierre Imai [Wed, 16 Mar 2016 01:11:10 +0000 (10:11 +0900)]
Remove references to deleted dhcpcd
Change-Id: Ic977c3aaa72544310696b970e73c64401aafbbc8
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: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:11:47 +0000 (17:11 -0700)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2
- kernel updates with patches for CVE-2015-1805
b/
27724967
Change-Id: Ie9daf35dcba3f844c925358daf2646b7ab5b5f5f
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
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
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
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 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
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 20:59:25 +0000 (20:59 +0000)]
Merge "Fix warning of "overriding commands for target ...boot.oat"." into nyc-dev
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
Sami Tolvanen [Tue, 15 Mar 2016 16:49:30 +0000 (16:49 +0000)]
Revert "Revert "build: pass version and patch level to mkbootimg""
This reverts commit
494a9090f96a7fc4e77f8f4fbb26d876a5fc8438.
Bug:
27498078
Bug:
22914603
Change-Id: Iee6a784271ec32c6bfcc0a6ad3f0395d82016df3
(cherry picked from commit
3303d909a1c43dec0d99d2c852311cf2171c7c18)
Ying Wang [Fri, 11 Mar 2016 18:32:01 +0000 (10:32 -0800)]
Rebuild odex files in PDK fusion build.
To rebuild odex files of Java libraries and apps,
we store the jars/apks without stripping the classes.dex inside the
platform.zip. We also save the build variables that may affect how we
rebuild an odex in pdk_dexpreopt_config.mk in the platform.zip.
We store the files and configuration only for libraries/apps that get
installed to the system.img (or vendor.img).
In PDK fusion build, we auto-generate prebuilt module definitions for
the javalib.jar and package.dex.apk carried in the platform.zip, using
configuration stored in pdk_dexpreopt_config.mk.
With the prebult modules, we override the implicit rule that directly
copies the odex from the platform.zip.
To rebuild odex of javalib.jar, we added support for prebuilt shared Java
library to prebiult_internal.mk. An installable prebuilt Java library is
treated as shared Java library, i.e. with classes.dex in the jar instead
of a set of .class files.
For apks in the platform.zip, we install the stripped version from
platform files inside platform.zip, instead of the package.dex.apk,
using a new variable LOCAL_REPLACE_PREBUILT_APK_INSTALLED. We can't
strip package.dex.apk because we can't re-sign the stripped apk at this
point.
We generate prebuilt module only if it's not already defined in the
source tree.
Bug:
27543283
Change-Id: I9e146f8b713d6f57c397fd28d88c9ab700757ca1
Alex Klyubin [Mon, 14 Mar 2016 20:33:26 +0000 (13:33 -0700)]
Fix two cosmetic issues in signapk.
* Zip EoCD record comment length was referred to as 32-bit whereas it
is a 16-bit field. The implementation was fine, but the comment and
the naming of a constant were wrong.
* System.out.println was left over from early prototyping days.
Removed.
Bug:
25794543
(cherry picked from commit
82bf99bb4e4cd4779a08daa21bd4bc2007042f41)
Change-Id: I9845b5fa096859d67b306f4b9b6c205cad622c0c
Prathmesh Prabhu [Mon, 14 Mar 2016 18:05:47 +0000 (11:05 -0700)]
Emulator: Bump arm(64) system image partition size to 1.75 GB
Change-Id: If9ce0346ed4ca7ceab3fda217e5c9de6d89b6c94
Sami Tolvanen [Mon, 14 Mar 2016 15:49:15 +0000 (15:49 +0000)]
Merge "Revert "build: pass version and patch level to mkbootimg"" into nyc-dev
Sami Tolvanen [Mon, 14 Mar 2016 15:47:11 +0000 (15:47 +0000)]
Revert "build: pass version and patch level to mkbootimg"
This reverts commit
e555f779626faeeddd8d23339241fa6a9240fa28.
Bug:
27580174
Change-Id: I0fd1ddb64d2fd4f91b0ecbc1ab8953a1324a10eb
Ian Pedowitz [Sat, 12 Mar 2016 06:13:36 +0000 (22:13 -0800)]
PLATFORM_PREVIEW_SDK_VERSION = 2 for DP2
Bug:
27150977
Change-Id: I8b86b5565dbdf81dffb4bc9ba0eef8a3c3f91d20
Stephen Hines [Fri, 4 Mar 2016 22:40:56 +0000 (14:40 -0800)]
Switch to clang-
2658975.
Bug: http://b/
27482631
This fixes an issue where krait compiles were not passing the proper
flags to the assembler when -no-integrated-as is used. This was
preventing ART from switching to clang in some cases.
(cherry picked from commit
c503d8ef5826bd1c79dc223ceba614532527a8c9)
Change-Id: I4a0efb78f37fee73bf61841f0347328b8f61c192
Andreas Gampe [Fri, 11 Mar 2016 16:20:50 +0000 (16:20 +0000)]
Merge changes I4a2692f3,Ifd8d3a2c into nyc-dev
* changes:
Build: Only preopt boot images in eng builds
Revert "Don't preopt on eng builds."
Andreas Gampe [Thu, 10 Mar 2016 23:34:46 +0000 (15:34 -0800)]
Build: Only preopt boot images in eng builds
As a middle way between full preopt/high performance/long builds,
and no preopt/low performance/fast turnaround, preopt only the
boot image in eng builds.
Bug:
26794212
Change-Id: I4a2692f3ce84823cd40c6b7d672fd73257739ef8
Scott Main [Thu, 10 Mar 2016 23:12:43 +0000 (23:12 +0000)]
Merge "change printed version in offline docs to check whether in preview or not, and change the title accordingly, using new preview codename or version number." into nyc-dev
smain@google.com [Wed, 9 Mar 2016 19:57:39 +0000 (11:57 -0800)]
make image resource URLs relative so they work in offline docs
Change-Id: I4329689d8a3db3ce67f1aa7084a3a4634721e3cb
(cherry picked from commit
7d959be058a2c7fd6e18636dcdf5efd4a0555cb9)
Andreas Gampe [Thu, 10 Mar 2016 23:07:27 +0000 (15:07 -0800)]
Revert "Don't preopt on eng builds."
This reverts commit
7effde0048bcce6084e00bf29ff3bea4f34d1599.
Bug:
25801231
Bug:
26794212
smain@google.com [Thu, 10 Mar 2016 22:16:25 +0000 (14:16 -0800)]
change printed version in offline docs to check whether in preview or not,
and change the title accordingly, using new preview codename or version number.
Change-Id: I2833dcd05447add10495fea2149b5a9678831235
Ying Wang [Thu, 10 Mar 2016 20:57:33 +0000 (12:57 -0800)]
Add dependency on boot_singer and vboot_singer if necessary.
Change-Id: Ic10c2ae6a0debf51100a30eb11217e77060a6066
smain@google.com [Wed, 9 Mar 2016 23:36:12 +0000 (15:36 -0800)]
change name of offline doc tab to "API reference"
and put the version number in the secondary nav bar (it was there anyway).
Change-Id: I4b49581eca6afa445a434cd6ae31572d01f276ef
(cherry picked from commit
06bdd78284057b399da728c1cfa1e2238ba84c37)
Neil Fuller [Thu, 10 Mar 2016 09:45:55 +0000 (09:45 +0000)]
Merge "Make the language version selection smarter" into nyc-dev
Joe Onorato [Wed, 9 Mar 2016 22:48:46 +0000 (14:48 -0800)]
Turn off excess printing during the build which makes errors harder to find.
Change-Id: I588de5ddc0aa7dcaacc4ea185c13c2fa3748888a
Mohamad Ayyash [Wed, 9 Mar 2016 20:56:18 +0000 (20:56 +0000)]
Merge "Hook incremental ext4 image generation into build" into nyc-dev
Elliott Hughes [Wed, 9 Mar 2016 15:56:50 +0000 (15:56 +0000)]
Merge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark." into nyc-dev
Tao Bao [Wed, 9 Mar 2016 05:39:13 +0000 (21:39 -0800)]
resolve merge conflicts of
2ad8b97577 to nyc-dev
Change-Id: Ifa7501e58dd25e73ed760b1383a1873e4d449885
Tao Bao [Wed, 9 Mar 2016 05:29:30 +0000 (05:29 +0000)]
Use the update-binary in the source build for downgrade OTAs. am:
fa41fb2705
am:
7302eb7dd6
* commit '
7302eb7dd6bd22c6123bd0b252889732e215592e':
Use the update-binary in the source build for downgrade OTAs.
Tao Bao [Wed, 9 Mar 2016 05:27:36 +0000 (05:27 +0000)]
Use the update-binary in the source build for downgrade OTAs.
am:
fa41fb2705
* commit '
fa41fb27054185b3fba0519d01dabd21444fe772':
Use the update-binary in the source build for downgrade OTAs.
Colin Cross [Wed, 9 Mar 2016 04:45:39 +0000 (04:45 +0000)]
Merge "Install boot.art extra files individually" into nyc-dev
Tao Bao [Fri, 4 Mar 2016 23:23:34 +0000 (15:23 -0800)]
releasetools: Fix the bug in AssertSequenceGood.
We use a bitset for blocks in the target image to assert a block hasn't
been touched before reading. Skip checking the blocks that are in the
source image only.
Bug:
27556903
Change-Id: I3a77292da673c813bd20d8dc177ff36419d8ecae
(cherry picked from commit
dca2200c8aa09b08ba0d37410a7826b737caecf2)
Tao Bao [Wed, 9 Mar 2016 01:53:39 +0000 (17:53 -0800)]
Use the update-binary in the source build for downgrade OTAs.
We used to use the update-binary from the target build when creating
incremental OTAs. But for downgrade OTAs, we should use the one in the
source build instead, which is actually newer.
Bug:
27556903
Change-Id: Ib6415729b979dbffdebdda24902f7f560942801a
(cherry picked from commit
4996cf03d2321eef56a8163c7fc73ba9976e1021)
Colin Cross [Tue, 8 Mar 2016 21:21:49 +0000 (13:21 -0800)]
Install boot.art extra files individually
The rule that builds boot.art also produces boot.oat, boot-*.art, and
boot-*.oat as a side effect, and the install rule for boot.art was
installing them using *.art and *.oat. This meant that PDK builds had
no rule to install the extra files, so it used the ones from the
platform.zip file instead of the locally built ones.
Generate a list of the files that should be produced by the boot.art
build, and manually create install rules for them that depend on the
built boot.art and are depended on by the installed boot.art.
Bug:
27546601
Change-Id: I9734491c3179bca2d4b2ae13b0c6a03e4c26b0b2
Elliott Hughes [Fri, 4 Mar 2016 21:37:43 +0000 (13:37 -0800)]
Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark.
Bug: http://b/
24803663
(cherry picked from commit
577f8407e915fd278d089968bdafdad171f8c3d1)
Change-Id: If1af37c419abe284677253c33de45dcb5ef6ea8d
smain@google.com [Tue, 8 Mar 2016 02:43:21 +0000 (18:43 -0800)]
Add new templates directory for "reference only" builds.
The only difference is that this changes the masthead.cs file to show a different header.
Change-Id: Id58eb7e8c42a8ab0886f2f5da794fcd108f299ff
(cherry picked from commit
5fea5df99cc93dba5388e0f033c2af931ac2cb33)
Sami Tolvanen [Fri, 4 Mar 2016 23:41:02 +0000 (15:41 -0800)]
build: pass version and patch level to mkbootimg
Add --os_version and --os_patch_level arguments to mkbootimg.
Needs matching changes from
I57682611e0c27fec5ed284da7d9a788383ff98b1
Bug:
27498078
Bug:
22914603
Change-Id: I04e20b0de40d864aac92ac7bcf466a6cbde3d0e4
(cherry pick from commit
8fb47f191f804d21e252ef7bb66886ea087c2d56)
Neil Fuller [Fri, 4 Mar 2016 18:00:00 +0000 (18:00 +0000)]
Make the language version selection smarter
Any artifacts that are targeting SDK versions < 24
and not explicitly setting the LOCAL_JAVA_LANGUAGE_VERSION
are now defaulted to 1.7.
Bug:
27495650
Bug:
26753820
Bug:
27377071
Change-Id: Ia903cd5bf14c1947c485384d095a93c0aa23d272
Tao Bao [Tue, 8 Mar 2016 05:49:33 +0000 (21:49 -0800)]
resolve merge conflicts of
08a3a32fa9 to nyc-dev
Change-Id: I6fd55b3d2bd0c396018163dd4f54970cb55432cd
Tao Bao [Tue, 8 Mar 2016 05:37:27 +0000 (05:37 +0000)]
resolve merge conflicts of
177c610e7f to cw-e-dev
am:
bd25fcdc02
* commit '
bd25fcdc02a94ec9f50fc431a3731484b9812e23':
DO NOT MERGE releasetools: Support generating downgrade incremental OTAs.
Tao Bao [Tue, 8 Mar 2016 05:24:40 +0000 (21:24 -0800)]
resolve merge conflicts of
177c610e7f to cw-e-dev
Change-Id: Iba7820247d0b53d7f9553290eb0db3547f31beda
Tao Bao [Tue, 23 Feb 2016 19:38:39 +0000 (11:38 -0800)]
DO NOT MERGE releasetools: Support generating downgrade incremental OTAs.
Add --downgrade flag to ota_from_target_files.py script. It allows
generating an incremental OTA that updates from a newer build to an
older one (based on timestamp comparison). "post-timestamp" line in the
metadata file will be replaced by "ota-downgrade=yes". A data wipe will
always be enforced, so "ota-wipe=yes" will also be included in the
metadata file.
Bug:
26883782
Change-Id: Iaa05f662d948b7ab632a9fbb7051cc3f8bf68c21
(cherry picked from commit
5d1825664a0fec256fa28d62aadcac96f59a41b2)
Yabin Cui [Wed, 2 Mar 2016 22:03:41 +0000 (14:03 -0800)]
Enable LOCAL_POST_LINK_CMD for non-static executables.
It is needed to insert testdata section into simpleperf cts test.
Bug:
27387280
Change-Id: I58cea106d135f535626d8624a016bd2aaceeb8ea
(cherry picked from commit
273e9109c1cefb760d96b8707d75704d733cc38b)
Ying Wang [Mon, 7 Mar 2016 19:27:20 +0000 (11:27 -0800)]
Fix dumping variables of absolute paths.
Calling $(abspath) is better than checking and prepending $(PWD) if
necessary.
Bug:
27429759
Change-Id: Ia156f8a5d6b88b6090f4d23c7f9166bd62d3ab70
(cherry-pick from commit
80ceadc94526d6c48c0022bf25281bb522914a3d)
Julien Desprez [Sat, 5 Mar 2016 12:05:49 +0000 (12:05 +0000)]
Support build old version of cts
Bug:
27508747
Change-Id: I3d474f6f6534e172ecf1d0a6c833a9dfa6164344
Prathmesh Prabhu [Fri, 4 Mar 2016 23:49:07 +0000 (23:49 +0000)]
Merge "emulator: Add a product packages overlay." into nyc-dev
Ying Wang [Fri, 4 Mar 2016 21:56:23 +0000 (13:56 -0800)]
Small fixes.
Change-Id: Ia949ed0bc93edb78d0b029f3bd3dd584e9a00dc8
(cherry-pick from commit
f0cb397a9e204c86be7730f94ae5fba84d88f89a)
Ying Wang [Fri, 4 Mar 2016 04:57:21 +0000 (20:57 -0800)]
Speed up lunch/tapas/etc. shell utility functions.
1. Combined ~10 calls to the make build system to only one.
We added a phony target "dump-many-vars" to the build system to dump
"<var>=<value>" pairs. We then store the pairs as shell variables.
With this cache get_build_var/get_abs_build_var can just return
the shell variables instead of querying the build system.
2. Prune .git when we search for AndroidProduct.mks.
In internal source tree lunch time was reduced from ~15s to ~1.5s.
Bug:
27429759
(cherry picked from commit
08800fd905e70faf01d9392d00ff3f49d99097b7)
Change-Id: I862a0ec3c1aae97c552054dacec133e857042edf
Prathmesh Prabhu [Fri, 4 Mar 2016 21:43:04 +0000 (13:43 -0800)]
emulator: Add a product packages overlay.
Emulator is a product, so add an overlay that allows us to override some
stock android resources.
BUG:
27484734
Change-Id: I1b651316a14f6d5c79651813ad13302b67507cae
Ying Wang [Thu, 3 Mar 2016 01:25:01 +0000 (17:25 -0800)]
Align up java-lib-files and java-lib-deps.
- For host Java libraries, java-lib-files should return javalib.jar.
- Host dalvik Java libraries are special: factor out
host-dex-java-lib-files.
- Be explict that jack-lib-deps equals jack-lib-files.
Bug:
27451686
Change-Id: I9235384354e119ef7ebbf29b7e525d1ceea242e0
Mohamad Ayyash [Thu, 3 Mar 2016 05:07:23 +0000 (21:07 -0800)]
Hook incremental ext4 image generation into build
Allows passing the *.base_fs or *.map files for system and vendor in
INTERNAL_SYSTEM_BASE_FS_PATH and INTERNAL_VENDOR_BASE_FS_PATH variables
respectively.
Internal Design Doc: go/incremental-ext4
BUG:
26839493
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Change-Id: Ie57ef6dbfa6084268b6535fe0a673a3b4aaa6e2f
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Ying Wang [Thu, 3 Mar 2016 18:09:31 +0000 (18:09 +0000)]
Merge "Add --auto-add-overlay if a module has LOCAL_STATIC_ANDROID_LIBRARIES" into nyc-dev
Ying Wang [Thu, 3 Mar 2016 17:34:59 +0000 (17:34 +0000)]
Merge "[DO NOT MERGE] Update BUILD_ID for nyc branches." into nyc-dev
Neil Fuller [Thu, 3 Mar 2016 09:11:07 +0000 (09:11 +0000)]
Merge "Add JarJar support to BUILD_HOST_JAVA_LIBRARY" into nyc-dev
Yohann Roussel [Thu, 3 Mar 2016 08:47:41 +0000 (08:47 +0000)]
Merge "Use Jack to check build" into nyc-dev
Ying Wang [Thu, 3 Mar 2016 02:55:46 +0000 (18:55 -0800)]
Add --auto-add-overlay if a module has LOCAL_STATIC_ANDROID_LIBRARIES
Bug:
25958912
Change-Id: Iafba9eefde0823095775474bcb7cc5b6c21fd248
Ying Wang [Thu, 3 Mar 2016 02:00:19 +0000 (18:00 -0800)]
[DO NOT MERGE] Update BUILD_ID for nyc branches.
Bug:
27327323
Change-Id: I60985c66a41cbece69f0a19c19bde7695b2ca48e
Ying Wang [Thu, 3 Mar 2016 00:55:24 +0000 (00:55 +0000)]
Merge "Calls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES" into nyc-dev
Ying Wang [Wed, 2 Mar 2016 18:19:25 +0000 (18:19 +0000)]
Merge "Clean generated source dir if .proto/.rs is gonee." into nyc-dev
Ying Wang [Wed, 2 Mar 2016 18:03:30 +0000 (18:03 +0000)]
Merge "Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS" into nyc-dev
Stuart Scott [Wed, 2 Mar 2016 16:42:41 +0000 (08:42 -0800)]
Add cts_v2 phony target for temporary build fix.
Change-Id: I770dc800dbcdff2c31e370410b32e2ee079f308b