OSDN Git Service
Michael Wright [Fri, 1 Jul 2016 15:40:55 +0000 (15:40 +0000)]
N MR1 is API 25
am:
bcdc880ca9
Change-Id: I5351dcf93a5c3aa816b2ea60fae5eb8fef020d5a
Michael Wright [Wed, 29 Jun 2016 14:33:37 +0000 (15:33 +0100)]
N MR1 is API 25
Bug:
29816674
Change-Id: Iaaf6de5e99cf21b489afe677a8bf8b5385d9ca6e
Andreas Gampe [Fri, 1 Jul 2016 05:57:25 +0000 (05:57 +0000)]
Build: Fix vendor sanitizer library for secondary arch
am:
5ed27e2d2f -s ours
Change-Id: Ida95d5f60fd1ced762e62782e582fc012188f86b
Andreas Gampe [Fri, 1 Jul 2016 04:57:31 +0000 (04:57 +0000)]
resolve merge conflicts of
9d73af0 to stage-aosp-master am:
ae492fd5f2
am:
5a88a4c1e8
Change-Id: Ie562114a319b9534851565af47e07458a0481880
Andreas Gampe [Fri, 1 Jul 2016 04:53:32 +0000 (04:53 +0000)]
resolve merge conflicts of
9d73af0 to stage-aosp-master
am:
ae492fd5f2
Change-Id: I8b0a27b2cf9a3179b097765a4c360c0a61c1ff21
Andreas Gampe [Fri, 1 Jul 2016 04:42:44 +0000 (21:42 -0700)]
resolve merge conflicts of
9d73af0 to stage-aosp-master
Change-Id: I984c48310e72cb509b859501cfb07258214038fa
Andreas Gampe [Fri, 1 Jul 2016 04:41:35 +0000 (04:41 +0000)]
Merge \\\"Build: Fix vendor sanitizer library for secondary arch\\\" am:
2302a76966 am:
80b32402dc
am:
2aac82f27c
Change-Id: I55e4d2c2718a49c9929601edefaf2845456eb854
Andreas Gampe [Fri, 1 Jul 2016 04:37:36 +0000 (04:37 +0000)]
Merge \\"Build: Fix vendor sanitizer library for secondary arch\\" am:
2302a76966
am:
80b32402dc
Change-Id: I6b59928b0d37aadbc29b9162521340062ec7d979
Andreas Gampe [Fri, 1 Jul 2016 04:33:43 +0000 (04:33 +0000)]
Merge \"Build: Fix vendor sanitizer library for secondary arch\"
am:
2302a76966
Change-Id: I2b21579df22b08655cdc9eab2d570304b167b5b6
Treehugger Robot [Fri, 1 Jul 2016 04:26:26 +0000 (04:26 +0000)]
Merge changes I17a96b97,Ib4412657,I73e6d479
* changes:
Build: Add module-level product configuration of sanitization
Build: Add option to restrict sanitization by owner
Build: Add option to restrict sanitization by architecture
Treehugger Robot [Fri, 1 Jul 2016 04:24:46 +0000 (04:24 +0000)]
Merge "Build: Fix vendor sanitizer library for secondary arch"
Andreas Gampe [Fri, 1 Jul 2016 03:20:38 +0000 (20:20 -0700)]
Build: Fix vendor sanitizer library for secondary arch
Fix the directory for secondary-architecture libraries under
sanitization. These incorrectly wrote into vendor/lib instead
of data/vendor/lib.
Bug:
29498013
(cherry picked from commit
cf6268f471f50599c004f6f18ee662273a0542b8)
Change-Id: Iee08422a1f7ad42cbe71a322347e98cb74e3ef7f
Andreas Gampe [Fri, 1 Jul 2016 03:20:38 +0000 (20:20 -0700)]
Build: Fix vendor sanitizer library for secondary arch
Fix the directory for secondary-architecture libraries under
sanitization. These incorrectly wrote into vendor/lib instead
of data/vendor/lib.
Bug:
29498013
Change-Id: Iee08422a1f7ad42cbe71a322347e98cb74e3ef7f
Evgenii Stepanov [Fri, 1 Jul 2016 00:55:56 +0000 (00:55 +0000)]
Merge \\\"Sanitizer build tweaks.\\\" am:
24dc27e643 am:
bd9f3f6187
am:
fd6304f541
Change-Id: I95c4d2cb618fffab1b7bb24d192c961a8a264ee7
Evgenii Stepanov [Fri, 1 Jul 2016 00:51:33 +0000 (00:51 +0000)]
Merge \\"Sanitizer build tweaks.\\" am:
24dc27e643
am:
bd9f3f6187
Change-Id: I2383d305625a872c7ec44ce594c30bd5c17c2983
Evgenii Stepanov [Fri, 1 Jul 2016 00:47:39 +0000 (00:47 +0000)]
Merge \"Sanitizer build tweaks.\"
am:
24dc27e643
Change-Id: I351ba996ee3ed77f6400e48149c972e271476a8f
Evgenii Stepanov [Fri, 1 Jul 2016 00:42:12 +0000 (00:42 +0000)]
Merge "Sanitizer build tweaks."
Evgenii Stepanov [Fri, 20 May 2016 00:49:51 +0000 (17:49 -0700)]
Sanitizer build tweaks.
-Wl,-no-undefined is currently disabled for any SANITIZE_TARGET. Limit that to
the sanitizers with a runtime library (i.e. address, thread).
Re-enable the relocation packer for ASan. This has been fixed upstream a long
time ago.
Bug:
27729263
Change-Id: I566df6104de816223dc1c519d41a87629ce9c47c
Evgenii Stepanov [Thu, 30 Jun 2016 23:58:12 +0000 (23:58 +0000)]
Merge \\\"Only add libdl dependency for ASan/TSan on target.\\\" am:
3d8ee8896b am:
2890414f78
am:
b4c796460f
Change-Id: I52a6df13e8c4503be1ddbb0025d2ff632aad2288
Evgenii Stepanov [Thu, 30 Jun 2016 23:58:11 +0000 (23:58 +0000)]
resolve merge conflicts of
ff3341b to stage-aosp-master am:
e6350dfddd
am:
83ae8a4ca9
Change-Id: I5d8893e9da402aea5416e38a3b5c6ef9808d3b17
Evgenii Stepanov [Thu, 30 Jun 2016 23:54:05 +0000 (23:54 +0000)]
Merge \\"Only add libdl dependency for ASan/TSan on target.\\" am:
3d8ee8896b
am:
2890414f78
Change-Id: I77a1824ebd28ad05ff635744e71e65259bf1e8f4
Evgenii Stepanov [Thu, 30 Jun 2016 23:54:04 +0000 (23:54 +0000)]
resolve merge conflicts of
ff3341b to stage-aosp-master
am:
e6350dfddd
Change-Id: If8afcbb7b2734866b1e0ed26760c1cc1fe235634
Evgenii Stepanov [Thu, 30 Jun 2016 23:50:50 +0000 (23:50 +0000)]
Merge \"Only add libdl dependency for ASan/TSan on target.\"
am:
3d8ee8896b
Change-Id: I97e2daed8c10a325e27969c2fcaac1848dfefa80
Evgenii Stepanov [Thu, 30 Jun 2016 23:49:26 +0000 (23:49 +0000)]
Merge "Only add libdl dependency for ASan/TSan on target."
Evgenii Stepanov [Thu, 12 May 2016 20:07:36 +0000 (13:07 -0700)]
Only add libdl dependency for ASan/TSan on target.
Only sanitizers that intercept stuff need that. For example,
SafeStack does not, and I think UBSan too.
Bug:
27729263
Change-Id: I413cd46cc6c6914a363a3c53da7954beacd8f0d8
Evgenii Stepanov [Thu, 30 Jun 2016 23:34:49 +0000 (16:34 -0700)]
resolve merge conflicts of
ff3341b to stage-aosp-master
Change-Id: I1883410889b8e6c6505042fcebca6c8764e15e9a
Andreas Gampe [Mon, 27 Jun 2016 22:15:31 +0000 (15:15 -0700)]
Build: Add module-level product configuration of sanitization
To allow special sanitizer settings for modules shared between
products, add product-specific module settings.
This was copied from the product-specific dexopt settings.
Bug:
29498013
Change-Id: I17a96b975bb6ac7f4ffb3d5b08e2f00b21bd97a1
(cherry picked from commit
bb5454b6db5770f0b0275424148b2d7d3c52a56d)
Andreas Gampe [Tue, 21 Jun 2016 00:46:29 +0000 (17:46 -0700)]
Build: Add option to restrict sanitization by owner
Add Make variable SANITIZE_NEVER_BY_OWNER to selectively
sanitize modules. By default, both are being sanitized. The
value of the variable is interpreted as a space or colon
separated list of owner names.
This can be used to create builds that lower the sanitization
burden by not sanitizing parts of the platform.
Bug:
29498013
Change-Id: Ib4412657fd38ff28a5c0863eddc2acde63c88ebb
(cherry picked from commit
ea38d8e95d7daea49cc2a528d69e06a0005b31a6)
Andreas Gampe [Tue, 21 Jun 2016 00:36:49 +0000 (17:36 -0700)]
Build: Add option to restrict sanitization by architecture
Add Make variable SANITIZE_ARCH to selectively sanitize binaries.
This uses the "bitness," i.e., 32 or 64, to potentially filter
the sanitization. By default, both are being sanitized.
This can be used to create builds that lower the sanitization
burden by not sanitizing "half" of the platform.
Bug:
29498013
Change-Id: I73e6d479f08a970ba912f4f63967d32f3487125f
(cherry picked from commit
0290a416c844f9a8ec953f63f199b00d36283228)
Evgenii Stepanov [Thu, 30 Jun 2016 22:49:52 +0000 (22:49 +0000)]
Merge "Add LOCAL_NOSANITIZE."
Evgenii Stepanov [Thu, 12 May 2016 20:07:17 +0000 (13:07 -0700)]
Add LOCAL_NOSANITIZE.
This can be used to selectively disable individual sanitizers on a
target. For example, some parts of libc should be built with
SafeStack (when requested with SANITIZE_TARGET), but never with
AddressSanitizer. Current build rules specify LOCAL_SANITIZE := never
to disable AddressSanitizer; the idea is to change that to
LOCAL_NOSANITIZE := address thread.
Bug:
27729263
Change-Id: I2b770f2ce3faf6ad6798792327e96adb86fe4a4f
Alex Light [Wed, 29 Jun 2016 22:43:45 +0000 (15:43 -0700)]
resolve merge conflicts of
3f7c348 to nyc-mr1-dev-plus-aosp
Bug:
29278988
Change-Id: Icffb9a280311c7d3c45f096243ddf18f7ebecd9d
Dan Willemsen [Wed, 29 Jun 2016 21:14:14 +0000 (14:14 -0700)]
resolve merge conflicts of
bfbcc0e to nyc-mr1-dev-plus-aosp
Change-Id: Iff6b808f5220050a876bc21fc0d221523d549976
Dan Willemsen [Wed, 29 Jun 2016 20:47:53 +0000 (20:47 +0000)]
Merge \\\"Detect \\\`uname -m\\\` == i686 as a 32-bit host\\\" am:
55d4a46f6d am:
db9f3489bc
am:
3b2288e3e0
Change-Id: I707398613a8aaf095945899f56ac3eb2e13a215b
Dan Willemsen [Wed, 29 Jun 2016 20:45:21 +0000 (20:45 +0000)]
Merge \\"Detect \\`uname -m\\` == i686 as a 32-bit host\\" am:
55d4a46f6d
am:
db9f3489bc
Change-Id: Ia6e75590c95a7e670f977a33b540b76f8b995af8
Dan Willemsen [Wed, 29 Jun 2016 20:39:42 +0000 (20:39 +0000)]
Merge \"Detect \`uname -m\` == i686 as a 32-bit host\"
am:
55d4a46f6d
Change-Id: Ia66952b98541755c55df1eb98775d749d2155dc1
Treehugger Robot [Wed, 29 Jun 2016 20:37:13 +0000 (20:37 +0000)]
Merge "Detect `uname -m` == i686 as a 32-bit host"
Alex Light [Wed, 29 Jun 2016 20:26:04 +0000 (20:26 +0000)]
Merge "Add system_other partition, install odex files" into nyc-mr1-dev
TreeHugger Robot [Wed, 29 Jun 2016 20:25:42 +0000 (20:25 +0000)]
Merge "Extract prebuilt APKs from zip files" into nyc-mr1-dev
Dan Willemsen [Wed, 29 Jun 2016 19:26:53 +0000 (12:26 -0700)]
Detect `uname -m` == i686 as a 32-bit host
Change-Id: I0350629ce6ea7a5f0224489bafc98bc190e70932
Test: UNAME from https://groups.google.com/d/msg/android-building/nGQna2xuW5s/eEcXSo9ZBgAJ
Tianjie Xu [Wed, 29 Jun 2016 18:50:53 +0000 (18:50 +0000)]
Merge \\\"Skip copying existing vendor images\\\" am:
1767d3f918 am:
85da4d3566
am:
317d1594e4
Change-Id: I609170449d1312537fd40496075c0b60a2bf9e13
Tianjie Xu [Wed, 29 Jun 2016 18:48:29 +0000 (18:48 +0000)]
Merge \\"Skip copying existing vendor images\\" am:
1767d3f918
am:
85da4d3566
Change-Id: I3d5ff34f134f674cbec66978385ad3936e9c119d
Tianjie Xu [Wed, 29 Jun 2016 18:45:57 +0000 (18:45 +0000)]
Merge \"Skip copying existing vendor images\"
am:
1767d3f918
Change-Id: I5f929adedb17b6d32d2e0e284aa37c39c643c3ea
Tianjie Xu [Wed, 29 Jun 2016 18:37:38 +0000 (18:37 +0000)]
Merge "Skip copying existing vendor images"
Tianjie Xu [Tue, 28 Jun 2016 21:34:03 +0000 (14:34 -0700)]
Skip copying existing vendor images
add_img_to_target_files.py has an option of "-a" to add missing
images only. Under this option, the script should skip copying
the radio images for A/B devices when given image exists already
under "IMAGES/".
Test: Run the command on an A/B device, the existing radio images under "IMAGES/" don't get overwritten; and missing images are added correctly.
Bug:
29608905
Change-Id: Ie034b85a5d777d53e367f99470cea4d19cb1aaaf
Yi Kong [Wed, 29 Jun 2016 11:14:30 +0000 (11:14 +0000)]
Merge \\\"Add jdk.net to whitelist\\\" am:
d2f4cbbf88 am:
09d7992067
am:
3fc2a2c326
Change-Id: I5939b0d36c8366ff2935ede6d295601951714e62
Yi Kong [Wed, 29 Jun 2016 11:11:49 +0000 (11:11 +0000)]
Merge \\"Add jdk.net to whitelist\\" am:
d2f4cbbf88
am:
09d7992067
Change-Id: I8f76af8ade472df24a7adaee133106cd6c54c2c3
Yi Kong [Wed, 29 Jun 2016 11:06:23 +0000 (11:06 +0000)]
Merge \"Add jdk.net to whitelist\"
am:
d2f4cbbf88
Change-Id: I80f7f529659953fd5664211e2a779d09e2245d34
Yi Kong [Wed, 29 Jun 2016 11:00:47 +0000 (11:00 +0000)]
Merge "Add jdk.net to whitelist"
Badhri Jagan Sridharan [Tue, 28 Jun 2016 23:58:05 +0000 (23:58 +0000)]
Merge \\\"Extract public key ID from cert\\\" am:
606ad22def am:
45373976b1
am:
c493619938 -s ours
Change-Id: I67700423a0ea58410c774a324f4f5a78a4b7d59e
Badhri Jagan Sridharan [Tue, 28 Jun 2016 23:42:47 +0000 (23:42 +0000)]
Merge \\"Extract public key ID from cert\\" am:
606ad22def
am:
45373976b1
Change-Id: I2d1d174d25aee419cd666ad9a69a8a590645af42
Badhri Jagan Sridharan [Tue, 28 Jun 2016 23:40:22 +0000 (23:40 +0000)]
Merge \"Extract public key ID from cert\"
am:
606ad22def
Change-Id: Idfc1ff8ec8766d4b15a5b1908a8eb830e28b42f3
Badhri Jagan Sridharan [Tue, 28 Jun 2016 23:36:22 +0000 (23:36 +0000)]
Merge "Extract public key ID from cert"
Badhri Jagan Sridharan [Sat, 30 Apr 2016 01:20:13 +0000 (18:20 -0700)]
Extract public key ID from cert
Extracts keyid inline using openssl commands.
The keyid is passed as one of the kernel command line parameters
for the dm-android-verity module to mount root fs(system)
with verity enabled.
(cherry-picked from
3af315aed5d657942b28ccae342324b9ee90116d
https://googleplex-android-review.git.corp.google.com/#/c/
1061691/)
BUG:
28384658
Change-Id: I8efbe1b0e415ef1d396f9b51cfa4b3fa01b22484
Badhri Jagan Sridharan [Tue, 28 Jun 2016 22:18:58 +0000 (15:18 -0700)]
resolve merge conflicts of
00046ad to nyc-mr1-dev-plus-aosp
Change-Id: I9540ecace4b20e8931fdf591e2d6604caf194f4c
Badhri Jagan Sridharan [Tue, 28 Jun 2016 21:30:14 +0000 (21:30 +0000)]
Merge "Add build variant to kernel command line" into nyc-mr1-dev
Dan Willemsen [Tue, 28 Jun 2016 19:53:37 +0000 (19:53 +0000)]
Merge \\\"Turn unused source files from warning to error\\\" am:
73609480b3 am:
90f03ecfee
am:
46b4d7aa8f
Change-Id: I52d276c2154214967373a6e0b9997fdf60be8265
Dan Willemsen [Tue, 28 Jun 2016 19:51:00 +0000 (19:51 +0000)]
Merge \\"Turn unused source files from warning to error\\" am:
73609480b3
am:
90f03ecfee
Change-Id: Ib350a58be93424cba2d9c18a55c40fce12af852e
Dan Willemsen [Tue, 28 Jun 2016 19:48:32 +0000 (19:48 +0000)]
Merge \"Turn unused source files from warning to error\"
am:
73609480b3
Change-Id: Iddedac74a78968eb438bddae1e22633ba8c13375
Treehugger Robot [Tue, 28 Jun 2016 19:41:39 +0000 (19:41 +0000)]
Merge "Turn unused source files from warning to error"
Allen Hair [Tue, 28 Jun 2016 18:30:39 +0000 (18:30 +0000)]
Merge \\"DO NOT MERGE Skip emma instrumentation if we\\'re using jack.\\" into nyc-dev am:
1f44c26b1e -s ours
am:
1f016493ca
Change-Id: I93d32080e46da6ea3494406e04d2cb2e292fcc20
Allen Hair [Tue, 28 Jun 2016 18:25:43 +0000 (18:25 +0000)]
Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev
am:
1f44c26b1e -s ours
Change-Id: I2c7de4484b78f31d83ae04c8e3c591e22d222689
Allen Hair [Tue, 28 Jun 2016 18:25:39 +0000 (18:25 +0000)]
Merge \\"DO NOT MERGE Skip emma instrumentation if we\\'re using jack.\\" into nyc-dev am:
1f44c26b1e
am:
49fd8a24f3 -s ours
Change-Id: I9a51bcb269dc9554e1389a00cf75b95f9bb6bbe6
Allen Hair [Tue, 28 Jun 2016 17:53:00 +0000 (17:53 +0000)]
Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev
am:
1f44c26b1e
Change-Id: I25d45b0d0d490d6cc3f80871fcf69bd9f1857216
Allen Hair [Tue, 28 Jun 2016 17:45:17 +0000 (17:45 +0000)]
Merge "DO NOT MERGE Skip emma instrumentation if we're using jack." into nyc-dev
Dan Willemsen [Tue, 28 Jun 2016 17:22:08 +0000 (10:22 -0700)]
Turn unused source files from warning to error
All instances have disappeared from the build server, so switch this to
error before more turn up.
Change-Id: Iac07526a6e77ebf33733033249f2a108aae3fa7d
Hung-ying Tyan [Tue, 28 Jun 2016 06:27:13 +0000 (06:27 +0000)]
Merge \\\"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\\\" am:
2acb2d5bcf am:
200da242a5
am:
00e23a1d8f
Change-Id: Ibf7c1fdeb9994b7c12ac3dd2fa8d8dec53b7d276
Hung-ying Tyan [Tue, 28 Jun 2016 06:24:48 +0000 (06:24 +0000)]
Merge \\"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\\" am:
2acb2d5bcf
am:
200da242a5
Change-Id: I93d1b301c23265e783e68de5e066606764b90ffc
Hung-ying Tyan [Tue, 28 Jun 2016 06:22:17 +0000 (06:22 +0000)]
Merge \"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\"
am:
2acb2d5bcf
Change-Id: I3c151949bcc6b8d75f2c46619b6ce38561084338
Treehugger Robot [Tue, 28 Jun 2016 06:17:32 +0000 (06:17 +0000)]
Merge "Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES"
Hung-ying Tyan [Fri, 20 May 2016 11:08:30 +0000 (19:08 +0800)]
Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES
Allow exceptions specified by module (VENDOR_EXCEPTION_MODULES) and
path (VENDOR_EXCEPTION_PATHS, not including leading vendor/).
BUG=
26968426
Change-Id: I068e43f3eae14f8793c33ae916d46979ab1681d1
Ethan Xia [Tue, 28 Jun 2016 02:02:12 +0000 (02:02 +0000)]
Merge \\\"releasetools: Change the default key path for bvbtool\\\" am:
7c7571d510 am:
090e8eff5e
am:
e4efe69fae
Change-Id: If1d96c88a42d3894d7c9bccef6064f159bf185d2
Ethan Xia [Tue, 28 Jun 2016 01:59:47 +0000 (01:59 +0000)]
Merge \\"releasetools: Change the default key path for bvbtool\\" am:
7c7571d510
am:
090e8eff5e
Change-Id: I34f3cc1a38b860fd3100548f55a38af9faf69e19
Ethan Xia [Tue, 28 Jun 2016 01:57:26 +0000 (01:57 +0000)]
Merge \"releasetools: Change the default key path for bvbtool\"
am:
7c7571d510
Change-Id: Ic02f432c689edba37ecce684662d8f5f1cfc32b6
Treehugger Robot [Tue, 28 Jun 2016 01:52:36 +0000 (01:52 +0000)]
Merge "releasetools: Change the default key path for bvbtool"
Andreas Gampe [Tue, 28 Jun 2016 00:38:26 +0000 (00:38 +0000)]
Build: Add module-level product configuration of sanitization
am:
bb5454b6db
Change-Id: I03c598091f51e179d278bfabaf3345f3cccc45d6
Allen Hair [Mon, 27 Jun 2016 19:32:50 +0000 (12:32 -0700)]
DO NOT MERGE Skip emma instrumentation if we're using jack.
Bug:
29777843
Change-Id: I09071ef08e0b2fe64a78cfd6d81c73aa9b80967f
Andreas Gampe [Mon, 27 Jun 2016 22:15:31 +0000 (15:15 -0700)]
Build: Add module-level product configuration of sanitization
To allow special sanitizer settings for modules shared between
products, add product-specific module settings.
This was copied from the product-specific dexopt settings.
Bug:
29498013
Change-Id: I17a96b975bb6ac7f4ffb3d5b08e2f00b21bd97a1
Ethan Xia [Mon, 27 Jun 2016 09:19:01 +0000 (17:19 +0800)]
releasetools: Change the default key path for bvbtool
The bvb path has been changed from 'system/bvb' to 'external/bvb'
Change-Id: I8587351b7d702a287883c6bd3c9de1cd3540435b
Ian Pedowitz [Sun, 26 Jun 2016 23:07:35 +0000 (23:07 +0000)]
Merge \\"The easter egg is now its own APK.\\" into nyc-dev am:
18ecea3986
am:
e4224c46cb
Change-Id: I7d05801270e0a938048a5f2fc505e3cd8630a42d
Ian Pedowitz [Sun, 26 Jun 2016 23:03:00 +0000 (23:03 +0000)]
Merge \\"The easter egg is now its own APK.\\" into nyc-dev am:
18ecea3986
am:
377d5bdb3f
Change-Id: I11f7501dcf768397acc4cfc74eee58d27013b6a4
Dan Sandler [Sun, 26 Jun 2016 22:56:05 +0000 (22:56 +0000)]
Merge \"The easter egg is now its own APK.\" into nyc-dev
am:
18ecea3986
Change-Id: I4712931d6e73ecb08dae76b77ad12585a914882b
Dan Sandler [Sun, 26 Jun 2016 22:56:03 +0000 (22:56 +0000)]
Merge \"The easter egg is now its own APK.\" into nyc-dev
am:
18ecea3986
Change-Id: Ica7456ab7bf01dba0f294fce3720b0e19db02f38
Ian Pedowitz [Sun, 26 Jun 2016 22:50:44 +0000 (22:50 +0000)]
Merge "The easter egg is now its own APK." into nyc-dev
Dan Sandler [Sat, 25 Jun 2016 14:54:39 +0000 (10:54 -0400)]
The easter egg is now its own APK.
It should be included wherever SystemUI is.
Bug:
27376882
Change-Id: Ibe2688c86e58bdfb8a5278c9c4939d7cdb524078
Christopher Wiley [Fri, 24 Jun 2016 21:34:33 +0000 (21:34 +0000)]
Merge \\\"Fix typo in setting PRIVATE_MODULE for AIDL source\\\" am:
05038d84dc am:
2ee4f68d38
am:
28db78a499
Change-Id: I2f87f686a2083c12faa087b4601ff81f5936cea7
Christopher Wiley [Fri, 24 Jun 2016 21:32:07 +0000 (21:32 +0000)]
Merge \\"Fix typo in setting PRIVATE_MODULE for AIDL source\\" am:
05038d84dc
am:
2ee4f68d38
Change-Id: Ifd141422ed041b077ba1f3c098b85b8d93feda42
Christopher Wiley [Fri, 24 Jun 2016 21:29:55 +0000 (21:29 +0000)]
Merge \"Fix typo in setting PRIVATE_MODULE for AIDL source\"
am:
05038d84dc
Change-Id: I3fb16f448c48e9e14fb4e7080c2955c3d38c6d11
Treehugger Robot [Fri, 24 Jun 2016 21:16:23 +0000 (21:16 +0000)]
Merge "Fix typo in setting PRIVATE_MODULE for AIDL source"
Christopher Wiley [Fri, 24 Jun 2016 20:13:52 +0000 (13:13 -0700)]
Fix typo in setting PRIVATE_MODULE for AIDL source
Bug:
29619260
Change-Id: I59f883c1a92075800844cc2a77b307782a9ab800
Chih-Hung Hsieh [Fri, 24 Jun 2016 18:21:46 +0000 (18:21 +0000)]
Merge \\\"Add +/- buttons to expand/collapse warning categories.\\\" am:
4837ce8ca6 am:
320d126394
am:
a612b58464
Change-Id: I3b1bc8ad038e92c2fec7029f2ecc526629424ae2
David Sehr [Fri, 24 Jun 2016 18:21:45 +0000 (18:21 +0000)]
Merge \\\"Filter logging from dexdump/dex2oat to errors only\\\" am:
be6b4fc1b3 am:
5efb73504d
am:
0aa5ad21f1
Change-Id: Ifd4960cce511b284fc11661d23f78a4476a42a47
Chih-hung Hsieh [Fri, 24 Jun 2016 18:17:05 +0000 (18:17 +0000)]
Merge \\"Add +/- buttons to expand/collapse warning categories.\\" am:
4837ce8ca6
am:
320d126394
Change-Id: I637c546da197a7d9cc6b1ea91dc6f45f51f7ecda
David Sehr [Fri, 24 Jun 2016 18:17:04 +0000 (18:17 +0000)]
Merge \\"Filter logging from dexdump/dex2oat to errors only\\" am:
be6b4fc1b3
am:
5efb73504d
Change-Id: I3a39624a5ce329f67c30ce71b00f685abd14f569
Tianjie Xu [Fri, 24 Jun 2016 18:12:13 +0000 (18:12 +0000)]
Merge \"Avoid writing too much new data per transfer\" into nyc-mr1-dev
am:
21e6dde63c
Change-Id: I4d9fae702e81cea01a0a602247e629e71dd4efc7
Chih-Hung Hsieh [Fri, 24 Jun 2016 18:12:10 +0000 (18:12 +0000)]
Merge \"Add +/- buttons to expand/collapse warning categories.\"
am:
4837ce8ca6
Change-Id: I56057da6bae847533cc59e9881e364f632927cd9
David Sehr [Fri, 24 Jun 2016 18:12:08 +0000 (18:12 +0000)]
Merge \"Filter logging from dexdump/dex2oat to errors only\"
am:
be6b4fc1b3
Change-Id: Ib938b1bbf29e482d02c2c3b7d5a5948ba2afee9a
Chih-hung Hsieh [Fri, 24 Jun 2016 18:07:44 +0000 (18:07 +0000)]
Merge "Add +/- buttons to expand/collapse warning categories."
Alex Light [Thu, 16 Jun 2016 21:47:10 +0000 (14:47 -0700)]
Add system_other partition, install odex files
For AB devices, support flashing two system partitions for factory use.
The normal system image on one partition, but without dex preopt. And a
system_other image that just contains the odex files. The dex files will
not be stripped out of the system image, in case the second system
partition is wiped.
Setting BOARD_USES_SYSTEM_OTHER_ODEX := true in the BoardConfig.mk
enables this behavior.
One can control which directories are placed in system_other by the
SYSTEM_OTHER_ODEX_FILTER configuration variable. Currently we default
to only copying only app and priv-app odexs.
Bug:
29278988
Change-Id: I7f4e87da919e7dc6a89fd8c668193cd4e98631bc
David Sehr [Fri, 24 Jun 2016 18:07:07 +0000 (18:07 +0000)]
Merge "Filter logging from dexdump/dex2oat to errors only"
OSDN Git Service
