OSDN Git Service
Stefan De Clercq [Tue, 17 May 2016 20:56:59 +0000 (20:56 +0000)]
Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev am:
2937ec60ea -s ours
am:
9497f830a2
* commit '
9497f830a25f90ed63b06a2f2636a9c99edd9979':
Add SDK 10 and 11 to list of supported Mac SDKs
Change-Id: Ia7c8b3244047cd7072feb9027608651d46ba07b4
Stefan De Clercq [Tue, 17 May 2016 20:53:09 +0000 (20:53 +0000)]
Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev
am:
2937ec60ea -s ours
* commit '
2937ec60ea64b5e1e821b40a227542b1d95b5bb4':
Add SDK 10 and 11 to list of supported Mac SDKs
Change-Id: I9dfc020e3f9083a02fc831b86294af0f26891526
Stefan De Clercq [Tue, 17 May 2016 20:09:01 +0000 (20:09 +0000)]
Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev
Dan Willemsen [Tue, 17 May 2016 19:54:53 +0000 (19:54 +0000)]
Merge "Remove redundant clang cppflags" am:
8bbed5a635
am:
51c38fe13f
* commit '
51c38fe13f8812f77a2aa9f76657f10f19ee07de':
Remove redundant clang cppflags
Change-Id: I49886cb27b60fca17de25f6be193383b40c0c936
Dan Willemsen [Tue, 17 May 2016 19:51:27 +0000 (19:51 +0000)]
Merge "Remove redundant clang cppflags"
am:
8bbed5a635
* commit '
8bbed5a6350a2a7ca1eb7d0886b783fa5b681180':
Remove redundant clang cppflags
Change-Id: Ic45e02c74ec154bc74b42dd12df2c162b4a862ce
Dan Willemsen [Tue, 17 May 2016 19:46:23 +0000 (19:46 +0000)]
Merge "Remove redundant clang cppflags"
Dan Willemsen [Tue, 17 May 2016 07:41:25 +0000 (00:41 -0700)]
Remove redundant clang cppflags
Cppflags always get added to cflags, so we don't need to duplicate clang
cppflags extras that are already in the clang cflags extras
Change-Id: Ic099f565f20fd993fc0713c033fbc5154373c98f
Shinichiro Hamaji [Tue, 17 May 2016 04:08:25 +0000 (04:08 +0000)]
Merge "Make apks depend on their certificates" am:
f0a465c2cb
am:
f562875d0c
* commit '
f562875d0c232b91be9a0931d30c31b1bbb98c45':
Make apks depend on their certificates
Change-Id: I28f5f91a6265201136cdf83c18c7ada359bb4d33
Shinichiro Hamaji [Tue, 17 May 2016 04:05:46 +0000 (04:05 +0000)]
Merge "Make apks depend on their certificates"
am:
f0a465c2cb
* commit '
f0a465c2cb5921762d7d17d65cd7352d0f64c261':
Make apks depend on their certificates
Change-Id: I1f89af20d7d4cb337a91203631ff68eb654b0e0c
Shinichiro Hamaji [Tue, 17 May 2016 03:58:31 +0000 (03:58 +0000)]
Merge "Make apks depend on their certificates"
Dan Willemsen [Tue, 17 May 2016 03:05:32 +0000 (03:05 +0000)]
Merge "Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV" am:
a794f4db22
am:
19fdc4428f
* commit '
19fdc4428f9036b059a1174a3236eef03180e826':
Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV
Change-Id: I143bf88ad5031764644dfb2c8b279513c809b50b
Dan Willemsen [Tue, 17 May 2016 03:03:01 +0000 (03:03 +0000)]
Merge "Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV"
am:
a794f4db22
* commit '
a794f4db220d0f357773a037d842f40ab463485f':
Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV
Change-Id: I7b1fcc43e7c2260632c61e29f0d6bfb41df1b812
Dan Willemsen [Tue, 17 May 2016 02:53:50 +0000 (02:53 +0000)]
Merge "Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV"
Amith Yamasani [Tue, 17 May 2016 00:33:05 +0000 (00:33 +0000)]
Merge "Add CtsShimPrebuilt" into nyc-dev
am:
85c33f500a
* commit '
85c33f500aa2ef7c70c1644617e7439b97f22a79':
Add CtsShimPrebuilt
Change-Id: I604118ab69b52d8965f30ef3f8e0d841a4d7a288
Amith Yamasani [Tue, 17 May 2016 00:27:54 +0000 (00:27 +0000)]
Merge "Add CtsShimPrebuilt" into nyc-dev
Dan Willemsen [Mon, 16 May 2016 21:41:49 +0000 (14:41 -0700)]
Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV
Instead, use the libgcc/libatomic/libgcov from the static libraries dir,
which is provided by Soong. Copy the libraries using the Soong script if
Soong is disabled - this can be removed once USE_SOONG is removed.
Change-Id: Iad2ad20ad5c3cfc48bf1e46e594a482609098d7a
Billy Lamberta [Mon, 16 May 2016 22:26:58 +0000 (22:26 +0000)]
docs: work minisite am:
09304b21b3 am:
05f772fe6b
am:
f06c24f0c1
* commit '
f06c24f0c1b06aaf24637c1392cd61f9bb52f66f':
docs: work minisite
Change-Id: I14e93ea722cef48c8dd4ee056fa8cdb1056128ec
Billy Lamberta [Mon, 16 May 2016 22:21:47 +0000 (22:21 +0000)]
docs: work minisite am:
09304b21b3
am:
05f772fe6b
* commit '
05f772fe6bb53190477d6b92e8098d53994cfdbf':
docs: work minisite
Change-Id: Ifff07a8a5d6b5aa9011226ec8d512f5e800ff4df
Billy Lamberta [Mon, 16 May 2016 22:15:52 +0000 (22:15 +0000)]
docs: work minisite
am:
09304b21b3
* commit '
09304b21b33f13480d4df58b53df89e6e1356537':
docs: work minisite
Change-Id: I3ee5ddd408506dbdce2168e8aeaa3a1a87442005
Billy Lamberta [Tue, 3 May 2016 22:28:41 +0000 (15:28 -0700)]
docs: work minisite
Changes needed to build the new directory
frameworks/base/docs/html/work. Support for
resource cards and navigation.
bug:
27744376
Change-Id: I8556eb0e2cf86eb83be395a97306d220394827cd
Amith Yamasani [Fri, 13 May 2016 18:25:07 +0000 (11:25 -0700)]
Add CtsShimPrebuilt
It was needed for a CTS test but was accidentally
left out?
Bug:
28398205
Change-Id: I7deea60e6b11bc11d3bd8e82170fc42df7cec3c7
Alex Klyubin [Mon, 16 May 2016 17:21:37 +0000 (17:21 +0000)]
Merge "No need to JAR-sign OTA update packages." am:
094caf99aa
am:
5e09800c76
* commit '
5e09800c7623f172368ebc426ee7987ea787cba7':
No need to JAR-sign OTA update packages.
Change-Id: I0da7e308c93a459a1152f95bdafad4e67997275d
Alex Klyubin [Mon, 16 May 2016 17:18:20 +0000 (17:18 +0000)]
Merge "No need to JAR-sign OTA update packages."
am:
094caf99aa
* commit '
094caf99aab48c7ef62fd635503a0c70c18ecfde':
No need to JAR-sign OTA update packages.
Change-Id: I0a0e73cc5f64ba20600c30b9f304b0ff06705693
Alex Klyubin [Mon, 16 May 2016 17:11:04 +0000 (17:11 +0000)]
Merge "No need to JAR-sign OTA update packages."
Alan Viverette [Mon, 16 May 2016 15:04:45 +0000 (15:04 +0000)]
Merge "Add missing support library projects to pathmap" into mnc-ub-dev am:
5b30101722
am:
c608284d22
* commit '
c608284d22b95733e6b3a24f84084d9268eeabdf':
Add missing support library projects to pathmap
Change-Id: I480d62e803903c7421826a8a368c66ac8eef57a8
Alan Viverette [Mon, 16 May 2016 15:01:38 +0000 (15:01 +0000)]
Merge "Add missing support library projects to pathmap" into mnc-ub-dev
am:
5b30101722
* commit '
5b3010172211583034d1cf5eac41583dae79d77a':
Add missing support library projects to pathmap
Change-Id: Ia5c43c59bd4ff26a2d1069f38205ee7a5de2181b
Alan Viverette [Mon, 16 May 2016 14:56:01 +0000 (14:56 +0000)]
Merge "Add missing support library projects to pathmap" into mnc-ub-dev
Joe Fernandez [Mon, 16 May 2016 01:16:27 +0000 (01:16 +0000)]
docs: Wear Preview - update TOC navigation behavior am:
f8e4e54b89 am:
f9601a7ad2
am:
f1ed84693e
* commit '
f1ed84693e5be34bebeafe1eb78a2f0cb6041b65':
docs: Wear Preview - update TOC navigation behavior
Change-Id: Ib24e9f48cf9c4ced46d43bfe056489aaf28ce9bc
Joe Fernandez [Mon, 16 May 2016 01:13:40 +0000 (01:13 +0000)]
docs: Wear Preview - update TOC navigation behavior am:
f8e4e54b89
am:
f9601a7ad2
* commit '
f9601a7ad261772cf0f89df267de6998fd65cc48':
docs: Wear Preview - update TOC navigation behavior
Change-Id: I4304642d26f0b975cb50bfdd53a04167d186b268
Joe Fernandez [Mon, 16 May 2016 01:10:52 +0000 (01:10 +0000)]
docs: Wear Preview - update TOC navigation behavior
am:
f8e4e54b89
* commit '
f8e4e54b89cf381a725e8be9e05eee2bb94b0f2c':
docs: Wear Preview - update TOC navigation behavior
Change-Id: I9cbf81eec6b55a40d573c0160b7f7936bd0eb621
Joe Fernandez [Mon, 16 May 2016 00:55:44 +0000 (17:55 -0700)]
docs: Wear Preview - update TOC navigation behavior
b/
28004352
Change-Id: I1818c7b0def80e5871a0e6abf0353e9216164e1f
Amanda Kassay [Sat, 14 May 2016 15:38:25 +0000 (15:38 +0000)]
Updated default.css and docs.js for DoD transition fallback. am:
4d5bcbf62a am:
613cf217cf am:
18840d1ecb
am:
600ccf1185
* commit '
600ccf1185bf6c1ad095297d3092242e1d5c1e67':
Updated default.css and docs.js for DoD transition fallback.
Change-Id: Idd75473052eb8e05f9c5e34f7289b3cd963f9a34
Amanda Kassay [Sat, 14 May 2016 15:35:22 +0000 (15:35 +0000)]
Updated default.css and docs.js for DoD transition fallback. am:
4d5bcbf62a am:
613cf217cf
am:
18840d1ecb
* commit '
18840d1ecbeeb4691e61a5745757c56af95d87fc':
Updated default.css and docs.js for DoD transition fallback.
Change-Id: I2b1a4174aee4c85df917431135529798790fd8cf
Amanda Kassay [Sat, 14 May 2016 15:32:26 +0000 (15:32 +0000)]
Updated default.css and docs.js for DoD transition fallback. am:
4d5bcbf62a
am:
613cf217cf
* commit '
613cf217cf3f60cadd6235e0336df2e076588e3c':
Updated default.css and docs.js for DoD transition fallback.
Change-Id: I4025f00dd7958af44c2aa3475f3ac397246e55e6
Amanda Kassay [Sat, 14 May 2016 15:29:30 +0000 (15:29 +0000)]
Updated default.css and docs.js for DoD transition fallback.
am:
4d5bcbf62a
* commit '
4d5bcbf62a0cc6ec1db0c860a818b6166dceed74':
Updated default.css and docs.js for DoD transition fallback.
Change-Id: I22a7466baee5d752542000565afb826eef06c96d
Dan Willemsen [Fri, 13 May 2016 23:58:48 +0000 (23:58 +0000)]
Merge "Soong: Read Android.soong.mk if skipping Android.mk" am:
ea71c96894
am:
b8759f4f4b
* commit '
b8759f4f4b060fe9c4dc60fa6d786949b81f4ca0':
Soong: Read Android.soong.mk if skipping Android.mk
Change-Id: Ibc2622b8292cb33270fe89ee8fcae4cdeb6b60c9
Dan Willemsen [Fri, 13 May 2016 23:56:11 +0000 (23:56 +0000)]
Merge "Soong: Read Android.soong.mk if skipping Android.mk"
am:
ea71c96894
* commit '
ea71c968943209f41191a1f164f899dd002b9119':
Soong: Read Android.soong.mk if skipping Android.mk
Change-Id: I76aa5c350a26ea718df36f1df4ba5ade3f49a478
Treehugger Robot [Fri, 13 May 2016 23:52:07 +0000 (23:52 +0000)]
Merge "Soong: Read Android.soong.mk if skipping Android.mk"
Stefan De Clercq [Fri, 13 May 2016 23:43:13 +0000 (16:43 -0700)]
Add SDK 10 and 11 to list of supported Mac SDKs
Change-Id: Id558ef72e03626e3e577bc1a4f5ab85d6fe8efc5
Joe Fernandez [Fri, 13 May 2016 23:48:31 +0000 (23:48 +0000)]
docs: Instant Apps - enable TOC and navigation for navigation am:
f38a01d800 am:
84a8735017
am:
a067357b5a
* commit '
a067357b5a8c6d4b271ae43ca9507091ea3d545b':
docs: Instant Apps - enable TOC and navigation for navigation
Change-Id: I942cfb1d627f3a1faed06c1ad2afcf26d5299149
Joe Fernandez [Fri, 13 May 2016 23:45:57 +0000 (23:45 +0000)]
docs: Instant Apps - enable TOC and navigation for navigation am:
f38a01d800
am:
84a8735017
* commit '
84a873501701f7846c09b4bff604e65c2c38a9bd':
docs: Instant Apps - enable TOC and navigation for navigation
Change-Id: I9b9974a0e180139dccea8867f3675473b95ba5be
Joe Fernandez [Fri, 13 May 2016 23:43:22 +0000 (23:43 +0000)]
docs: Instant Apps - enable TOC and navigation for navigation
am:
f38a01d800
* commit '
f38a01d800b05187db6515527df919a1a8dec6f5':
docs: Instant Apps - enable TOC and navigation for navigation
Change-Id: I1b05ae4d00f7ac446274978dc6f32fa98c804d81
Joe Fernandez [Fri, 13 May 2016 22:43:25 +0000 (15:43 -0700)]
docs: Instant Apps - enable TOC and navigation for navigation
Change-Id: I7a259da8618f090a8146d4f42608ebc8baf73af1
Dan Willemsen [Fri, 13 May 2016 22:58:52 +0000 (15:58 -0700)]
Soong: Read Android.soong.mk if skipping Android.mk
If Soong is enabled, and we're skipping an Android.mk because there is
an Android.bp file, check for an Android.soong.mk file and read that
instead. This will allow us to temporarily define modules or recurse
into subdirectories that soong does not yet support.
Change-Id: Ifdb2f0204a38a5069e53527f66ffcfb8008c11a4
Tao Bao [Fri, 13 May 2016 22:49:23 +0000 (22:49 +0000)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check. am:
16536a53a0 am:
801dc8925f am:
cb5268ef2e -s ours
am:
fb9e214b8c
* commit '
fb9e214b8c227fba93e668b824612038c816edf1':
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
Change-Id: I0b0c8187d84178267ee62e7c619961f57c646c6b
Colin Cross [Fri, 13 May 2016 22:46:50 +0000 (22:46 +0000)]
Merge "Default USE_SOONG to true" am:
ac33935ac1
am:
c33da56ff3
* commit '
c33da56ff30e89f5b09ec02d0b50815b27ab833e':
Default USE_SOONG to true
Change-Id: Ib795a91a609da4402984c56a493e20dee90ec54f
Colin Cross [Fri, 13 May 2016 22:44:16 +0000 (22:44 +0000)]
Merge "Default USE_SOONG to true"
am:
ac33935ac1
* commit '
ac33935ac1721c640ce39b722cb7471ea9a5949d':
Default USE_SOONG to true
Change-Id: Ie75c39b174b20af51e13bd7f6e0dfdb50d903233
Tao Bao [Fri, 13 May 2016 22:44:16 +0000 (22:44 +0000)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check. am:
16536a53a0 am:
801dc8925f
am:
cb5268ef2e -s ours
* commit '
cb5268ef2e77073d76847eef6391683a3c288121':
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
Change-Id: Ic47389e443ebe2aa91953082dd47ed9119f2f5a6
Tao Bao [Fri, 13 May 2016 22:41:42 +0000 (22:41 +0000)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check. am:
16536a53a0
am:
801dc8925f
* commit '
801dc8925fcc148f438ceca751b2c14a853bece7':
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
Change-Id: I98966afb7be0c91d4985985a5abd05fee05e0d8f
Colin Cross [Fri, 13 May 2016 22:40:23 +0000 (22:40 +0000)]
Merge "Default USE_SOONG to true"
Tao Bao [Fri, 13 May 2016 22:39:07 +0000 (22:39 +0000)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
am:
16536a53a0
* commit '
16536a53a057778240b1a3a923b5dde31b79bd90':
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
Change-Id: I07d7bf9a34dabd3646f341427d9f53a74e9e8fc9
Dan Willemsen [Fri, 13 May 2016 22:36:22 +0000 (22:36 +0000)]
Merge "Don\'t use GTEST_OS_LINUX on Darwin" am:
439f4dd189
am:
33b3051784
* commit '
33b30517846744adff51579f26a711732caaa338':
Don't use GTEST_OS_LINUX on Darwin
Change-Id: Iff14f3c4819c2b604bf0c39b69a45110fcee1fbf
Evgenii Stepanov [Fri, 13 May 2016 22:36:21 +0000 (22:36 +0000)]
Merge "Pass USE_SAFESTACK to Soong." am:
00bccf54d4
am:
5bd91e69f7
* commit '
5bd91e69f79db2cee14bd18d08f6be7720d6ff5c':
Pass USE_SAFESTACK to Soong.
Change-Id: I55b7ba71e7efdb401d5466af13895f94a3972020
Dan Willemsen [Fri, 13 May 2016 22:33:48 +0000 (22:33 +0000)]
Merge "Don\'t use GTEST_OS_LINUX on Darwin"
am:
439f4dd189
* commit '
439f4dd1895eef8684b3257fe5631a45d51635d6':
Don't use GTEST_OS_LINUX on Darwin
Change-Id: Ie05e2df72a2cbfa52d6b767cd009c36a640ef23e
Evgenii Stepanov [Fri, 13 May 2016 22:33:47 +0000 (22:33 +0000)]
Merge "Pass USE_SAFESTACK to Soong."
am:
00bccf54d4
* commit '
00bccf54d4b3847cf54f6507c8fa29eabf26f2e7':
Pass USE_SAFESTACK to Soong.
Change-Id: I9258135b2debee97b21de27232a7530780a63f5d
Dan Willemsen [Fri, 13 May 2016 22:29:16 +0000 (22:29 +0000)]
Merge "Don't use GTEST_OS_LINUX on Darwin"
Evgenii Stepanov [Fri, 13 May 2016 22:24:52 +0000 (22:24 +0000)]
Merge "Pass USE_SAFESTACK to Soong."
Tao Bao [Thu, 27 Aug 2015 00:07:14 +0000 (17:07 -0700)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
RangeSet("2-10").monotonic gives a wrong result of "False". Fix the bug
and add more tests into test_rangelib.py.
Bug:
28760775
Change-Id: I04780571b45ecafd34040f405756b9745a9e21a5
(cherry picked from commit
e8f756137c39fc3292014f2eab5f84c6e5135797)
Evgenii Stepanov [Fri, 13 May 2016 01:03:23 +0000 (18:03 -0700)]
Pass USE_SAFESTACK to Soong.
Change-Id: I51a94da0942aa1a1e003c134a30e8da82e1270b8
Dan Willemsen [Wed, 9 Mar 2016 19:01:43 +0000 (11:01 -0800)]
Don't use GTEST_OS_LINUX on Darwin
Change-Id: If77118591daa7b474e6989e03109ea32ddd357b2
Amanda Kassay [Fri, 13 May 2016 16:24:39 +0000 (12:24 -0400)]
Updated default.css and docs.js for DoD transition fallback.
Change-Id: I0a978667b2ead38ba8dad8c90b173e9e91abd6f2
Ian Rogers [Fri, 13 May 2016 18:24:36 +0000 (18:24 +0000)]
Merge "Make Error Prone warnings in sync with Error Prone documenation." am:
86c3b72d9c
am:
f87e3bb296
* commit '
f87e3bb29664d53e3f74fecd395e12c14b7c3691':
Make Error Prone warnings in sync with Error Prone documenation.
Change-Id: Icd93fd98666f35cc936ff80db2f717ae9cacdb32
Baligh Uddin [Fri, 13 May 2016 18:21:58 +0000 (18:21 +0000)]
Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev am:
b0c6b7d072 -s ours
am:
f042baf4cc
* commit '
f042baf4cc636c7d3a2a6804e3c2aa4aec6ce84a':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: Ic8bee830ca8d6ffe96be82201b44d5534e4af1a3
Ian Rogers [Fri, 13 May 2016 18:21:57 +0000 (18:21 +0000)]
Merge "Make Error Prone warnings in sync with Error Prone documenation."
am:
86c3b72d9c
* commit '
86c3b72d9c9cb46acd7b8339dc3ce0a2f869fb2f':
Make Error Prone warnings in sync with Error Prone documenation.
Change-Id: I78b111feb108096a9b38c798dd4ee666a6852797
Ian Rogers [Fri, 13 May 2016 18:19:18 +0000 (18:19 +0000)]
Merge "Make Error Prone warnings in sync with Error Prone documenation."
Mohamad Ayyash [Fri, 13 May 2016 18:19:12 +0000 (18:19 +0000)]
Merge "Use fs_config files for mksquashfs" am:
4730facd73
am:
09bb85af92
* commit '
09bb85af92c075e076c566dd6e21cac3ad9b9136':
Use fs_config files for mksquashfs
Change-Id: Ida493915a4153ee7c8f3ed15293d5cf68ddfc48d
Tianjie Xu [Fri, 13 May 2016 18:18:57 +0000 (18:18 +0000)]
Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev
am:
b0c6b7d072 -s ours
* commit '
b0c6b7d0722917a66aa4338e4f2b258cd221a4be':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: I2b969467e56cc9c6197a181545276f75d5188bca
Mohamad Ayyash [Fri, 13 May 2016 18:16:05 +0000 (18:16 +0000)]
Merge "Use fs_config files for mksquashfs"
am:
4730facd73
* commit '
4730facd7399ead0d753d7b588001faf6469e041':
Use fs_config files for mksquashfs
Change-Id: I3c7c7c618e18598cda56f153d9ac8a988ef85510
Tianjie Xu [Fri, 13 May 2016 18:15:52 +0000 (18:15 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib am:
8d11597558 am:
8ae473d182 am:
9e337ed21c -s ours
am:
fe740bacea
* commit '
fe740baceabd28a3978388865f47dfa2acbf4f3d':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: I4094c68359acb805c9cdf84cd2838f16bf6eef1c
Alan Viverette [Fri, 13 May 2016 18:15:25 +0000 (14:15 -0400)]
Add missing support library projects to pathmap
Bug:
28716910
Change-Id: I8eab2d638b72d591e157958b7b043431263f4409
Tianjie Xu [Fri, 13 May 2016 18:13:24 +0000 (18:13 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib am:
8d11597558 am:
8ae473d182
am:
9e337ed21c -s ours
* commit '
9e337ed21ceb8c31aaafdae67ecaa1a7c7451a47':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: I810854509e0fadd4e96ccf5b69c8c17fd29f9226
Treehugger Robot [Fri, 13 May 2016 18:13:22 +0000 (18:13 +0000)]
Merge "Use fs_config files for mksquashfs"
Baligh Uddin [Fri, 13 May 2016 18:11:11 +0000 (18:11 +0000)]
Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev
Tianjie Xu [Fri, 13 May 2016 18:10:55 +0000 (18:10 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib am:
8d11597558
am:
8ae473d182
* commit '
8ae473d18280e25d010c040147393a3b1e3bbc75':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: Ibbed631ec32f00f026bdcf4af8a9a1213d87b4e5
Tianjie Xu [Fri, 13 May 2016 18:08:12 +0000 (18:08 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
am:
8d11597558
* commit '
8d1159755849ffcc1bd5c0de2821a4f5fe4ea58d':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: Ie0180bab1d41d86d3d2c3f14501b51b50f74635e
Tianjie Xu [Fri, 8 Apr 2016 03:17:48 +0000 (20:17 -0700)]
DO NOT MERGE 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:
28760775
Bug:
28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac
(cherry picked from commit
cd1e16a7616092e5a315b0a421a0c082da144145)
(cherry picked from commit
8d1159755849ffcc1bd5c0de2821a4f5fe4ea58d)
Tianjie Xu [Fri, 8 Apr 2016 03:17:48 +0000 (20:17 -0700)]
DO NOT MERGE 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:
28760775
Bug:
28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac
(cherry picked from commit
cd1e16a7616092e5a315b0a421a0c082da144145)
Ian Rogers [Fri, 13 May 2016 15:59:00 +0000 (08:59 -0700)]
Make Error Prone warnings in sync with Error Prone documenation.
Use summary information from annotation within Error Prone to auto-generate
the warnings list.
Bug:
28681096
Change-Id: Ib3a5f734bd229726fcd7332eaa9e0e1bd1200c25
Shinichiro Hamaji [Fri, 13 May 2016 07:03:24 +0000 (16:03 +0900)]
Make apks depend on their certificates
Bug:
27954979
Change-Id: I02db576cb80cbb9dd684d931da02e1b3b3efdf37
Shinichiro Hamaji [Fri, 13 May 2016 05:33:09 +0000 (14:33 +0900)]
resolve merge conflicts of
505f1ea to nyc-dev-plus-aosp
Change-Id: I023ace4df452371eea1b0b004d8817e6fe90585e
Shinichiro Hamaji [Fri, 13 May 2016 05:24:35 +0000 (05:24 +0000)]
Merge "Follow symlinks when using find for assets"
am:
4c4c06016b
* commit '
4c4c06016bfe62fde1aaf2fff33d6f6c55f78b89':
Follow symlinks when using find for assets
Change-Id: I62fc48be86bbbac6e0d2f09e398a4922fe21668a
Shinichiro Hamaji [Fri, 13 May 2016 05:20:05 +0000 (05:20 +0000)]
Merge "Follow symlinks when using find for assets"
Mohamad Ayyash [Fri, 8 Apr 2016 05:10:51 +0000 (22:10 -0700)]
Use fs_config files for mksquashfs
BUG:
27467028
Change-Id: I7648030ad4b31d70a5d439e9552fd2cbfe288b74
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
BUG:
28704419
Dan Willemsen [Fri, 13 May 2016 01:43:09 +0000 (01:43 +0000)]
Merge "Read Soong-exported configuration" am:
c7b610a67e
am:
bcbba61a25
* commit '
bcbba61a2500da9c51690ef8956e15020e9f6fea':
Read Soong-exported configuration
Change-Id: Ia23208e26bae53bd74bb77b0a0ebbe63ac6f8a9c
Dan Willemsen [Fri, 13 May 2016 01:40:48 +0000 (01:40 +0000)]
Merge "Read Soong-exported configuration"
am:
c7b610a67e
* commit '
c7b610a67ebff333cede41d5f336165485c9ae5d':
Read Soong-exported configuration
Change-Id: I0890077c980e0e9d863809bc02fbb8e2f5aa8018
Dan Willemsen [Fri, 13 May 2016 01:36:28 +0000 (01:36 +0000)]
Merge "Read Soong-exported configuration"
Baligh Uddin [Thu, 12 May 2016 23:22:24 +0000 (23:22 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours am:
e3b631a5d6 -s ours am:
7e806813bb -s ours am:
e20dd6dca2 -s ours am:
63847c39a6 -s ours
am:
53380a8386 -s ours
* commit '
53380a8386b977c8117d0030d65a1f004822ac11':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I2f922b9e4551849017b6523eb2c8c640870f8b64
Baligh Uddin [Thu, 12 May 2016 23:19:56 +0000 (23:19 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours am:
e3b631a5d6 -s ours am:
7e806813bb -s ours am:
e20dd6dca2 -s ours
am:
63847c39a6 -s ours
* commit '
63847c39a64e7ab0a5e8564d887864c02a7ba2a5':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I289fc7b1d9ef94d6a298cfbd64ee6f66e8790b64
Baligh Uddin [Thu, 12 May 2016 23:17:37 +0000 (23:17 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours am:
e3b631a5d6 -s ours am:
7e806813bb -s ours
am:
e20dd6dca2 -s ours
* commit '
e20dd6dca20231b7e68f3a8874bccedc1e56c40f':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I7391006c948be8188b8b197c1e318b76a826155a
Baligh Uddin [Thu, 12 May 2016 23:15:18 +0000 (23:15 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours am:
e3b631a5d6 -s ours
am:
7e806813bb -s ours
* commit '
7e806813bb0c3df85c69aaa78a21d0d5dac7e92b':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: Ic99ba9bb2041840402829b1d2e75684bfbeb66f2
Baligh Uddin [Thu, 12 May 2016 23:12:59 +0000 (23:12 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours
am:
e3b631a5d6 -s ours
* commit '
e3b631a5d62923a381bf0ecb151a1ec9c584380c':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I7f17e328de62c50087bc6d2acf3d8c17f5fb541f
Baligh Uddin [Thu, 12 May 2016 23:10:35 +0000 (23:10 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours
am:
e038da17f3 -s ours
* commit '
e038da17f38eac01e6c971d9f5956ea701a341e2':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: Ice12c95006ab0b10fa2d2a6413925001249564d8
Baligh Uddin [Thu, 12 May 2016 23:08:02 +0000 (23:08 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours
am:
d28e7ea333 -s ours
* commit '
d28e7ea333986fe820f19f2b34dec074f3b8bc22':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I65fd87879662e05d3906d530d5cba3e0d313990c
Baligh Uddin [Thu, 12 May 2016 23:05:19 +0000 (23:05 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
am:
f193546d65 -s ours
* commit '
f193546d65d41d40bd0e24e9bfe443001a320d1a':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I3fe077a1b75e67963cfbcc7430912afd5143d418
Baligh Uddin [Thu, 12 May 2016 22:55:26 +0000 (15:55 -0700)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Bug:
23967152
Change-Id: I2e2f1ead28f51f549dafacfc7d1d1e65b0b84bc7
Dan Willemsen [Thu, 12 May 2016 20:46:28 +0000 (20:46 +0000)]
Merge "Use product-specific Soong outputs" am:
f100d01dd5
am:
f8c5eac739
* commit '
f8c5eac739399522fffe3521f9d782aecfa6ca48':
Use product-specific Soong outputs
Change-Id: I559504dc7338f19c0dd4776495b3f27c8b0a7cd6
Dan Willemsen [Thu, 12 May 2016 20:43:47 +0000 (20:43 +0000)]
Merge "Use product-specific Soong outputs"
am:
f100d01dd5
* commit '
f100d01dd5dde712a19bd75f8f6895b21641bd62':
Use product-specific Soong outputs
Change-Id: I530778730be7424be3d3fbe88fd65fc70d2a0d12
Dan Willemsen [Tue, 29 Mar 2016 19:32:16 +0000 (12:32 -0700)]
Read Soong-exported configuration
This is to ensure that Make and Soong agree on configuration variables
like TARGET_GLOBAL_CFLAGS. Only a few variables are actually checked
currently until we make more actually the same.
Bug:
23566674
Change-Id: Ibede43d933ede4d470e182f9490ea6ec4ef52fbc
Dan Willemsen [Thu, 12 May 2016 20:33:05 +0000 (20:33 +0000)]
Merge "Use product-specific Soong outputs"
Ian Pedowitz [Thu, 12 May 2016 19:01:17 +0000 (19:01 +0000)]
Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev
am:
77df46efec
* commit '
77df46efec7996325cbdb17b67bcecbbe88bfa6b':
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Change-Id: I463332a4a8e3113749de2a0179c086f45a07c7a3