OSDN Git Service
Alan Viverette [Thu, 19 May 2016 19:48:49 +0000 (19:48 +0000)]
Merge "Add documents-archive to SDK, docs builds" into nyc-dev
am:
88b0d6a63d
* commit '
88b0d6a63d8149d14032d298eccde79a6d3079d4':
Add documents-archive to SDK, docs builds
Change-Id: I2c07f2f20da849174d23dfe6ab5c81008c37c6b1
Alan Viverette [Thu, 19 May 2016 19:39:10 +0000 (19:39 +0000)]
Merge "Add documents-archive to SDK, docs builds" into nyc-dev
Baligh Uddin [Thu, 19 May 2016 16:56:20 +0000 (16:56 +0000)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am:
74da4d6eef am:
cea440c2eb am:
9606ea8a43 -s ours
am:
3c42a21466
* commit '
3c42a2146612209e7b8eab749cbafe7f0782e942':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: I173d5494f192dc907ae5e6db1e6318bfe66b38c4
Baligh Uddin [Thu, 19 May 2016 16:52:12 +0000 (16:52 +0000)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am:
74da4d6eef am:
cea440c2eb
am:
9606ea8a43 -s ours
* commit '
9606ea8a4306ac2be9b3d9c17ad7dc890cf25170':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: Ia925f396973716d5fcd3120a74b0c44ad99a99fc
Baligh Uddin [Thu, 19 May 2016 16:47:58 +0000 (16:47 +0000)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am:
74da4d6eef
am:
cea440c2eb
* commit '
cea440c2ebb8982158adc8bebf3a4cd85a5950fd':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: Ia8380c1e5f81d7225baee928ba2a35290aca4f85
Baligh Uddin [Thu, 19 May 2016 16:43:34 +0000 (16:43 +0000)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
am:
74da4d6eef
* commit '
74da4d6eef1da6490729dfbd069adf913d9aa6fa':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: Iefc0f7c90f631d6298931c9426d8edfbb60aa437
Baligh Uddin [Thu, 19 May 2016 15:50:19 +0000 (08:50 -0700)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
otatools.zip is used to release key sign device images.
Bug:
23967152
Andreas Gampe [Thu, 19 May 2016 05:10:55 +0000 (05:10 +0000)]
Build: Use phone compiled-classes in core_minimal
am:
695b28f67c
* commit '
695b28f67c88b87486911f8881078e7857e989a8':
Build: Use phone compiled-classes in core_minimal
Change-Id: I3b3a362c17c741994b34a2f70301806eadf9098d
Andreas Gampe [Thu, 19 May 2016 03:10:43 +0000 (20:10 -0700)]
Build: Use phone compiled-classes in core_minimal
Use default phone compiled-classes list to cut down boot image
size on most devices.
Bug:
28026683
Change-Id: I73bb59b792923ebc7549f775085b1c9aed88cc1a
Dan Willemsen [Thu, 19 May 2016 01:26:05 +0000 (01:26 +0000)]
Merge "Windows: Stop adding to GLOBAL_LD_DIRS" am:
e23a49157f
am:
84eb1d2cca
* commit '
84eb1d2ccad40ecffa989fe0babf1c4a9c589f0a':
Windows: Stop adding to GLOBAL_LD_DIRS
Change-Id: I4e8de34d50c0ab9e57e2f7c3801b2e1b4d9a981b
Dan Willemsen [Thu, 19 May 2016 01:23:22 +0000 (01:23 +0000)]
Merge "Windows: Stop adding to GLOBAL_LD_DIRS"
am:
e23a49157f
* commit '
e23a49157f34a3c3f82115a117908d32b14a6262':
Windows: Stop adding to GLOBAL_LD_DIRS
Change-Id: I8b834feed668c311169ec5da294414f47d4175be
Dan Willemsen [Thu, 19 May 2016 01:09:28 +0000 (01:09 +0000)]
Merge "Windows: Stop adding to GLOBAL_LD_DIRS"
Dan Willemsen [Thu, 19 May 2016 00:08:00 +0000 (00:08 +0000)]
Merge "Remove trailing newline from TARGET_C_INCLUDES" am:
6864e3790c
am:
cb0bccf423
* commit '
cb0bccf42335b4f389e1e3efa2f8681e9b0b2abe':
Remove trailing newline from TARGET_C_INCLUDES
Change-Id: Ibdaec09f72aa7831a141e1130700840235569d8b
Dan Willemsen [Thu, 19 May 2016 00:05:26 +0000 (00:05 +0000)]
Merge "Remove trailing newline from TARGET_C_INCLUDES"
am:
6864e3790c
* commit '
6864e3790c80d3044307f0d260cf0e2b962ae82d':
Remove trailing newline from TARGET_C_INCLUDES
Change-Id: I615050a58cca90291f2c07cae4397a711c69e585
Dan Willemsen [Wed, 18 May 2016 23:18:13 +0000 (16:18 -0700)]
Windows: Stop adding to GLOBAL_LD_DIRS
Soong does not have the idea of global linking directories, so move the
windows prebuilt library directory to GLOBAL_LDFLAGS instead.
Change-Id: Ie101146f4682cd85924463aa5acaa46869938e6c
Dan Willemsen [Wed, 18 May 2016 23:50:27 +0000 (23:50 +0000)]
Merge "Remove trailing newline from TARGET_C_INCLUDES"
Dan Willemsen [Wed, 18 May 2016 22:36:37 +0000 (15:36 -0700)]
Remove trailing newline from TARGET_C_INCLUDES
In preparation for comparing with the Soong variable.
Change-Id: I159507757ed7678a33a3c94e6d01d170485e251a
Alex Light [Wed, 18 May 2016 21:20:40 +0000 (21:20 +0000)]
Merge "Add fake libart" am:
49a4be8130
am:
c7e74a370a
* commit '
c7e74a370aaf3fa6c31e6552b90f6e95fe217d06':
Add fake libart
Change-Id: I320a4d810a611b59410330ce1c48936d63158705
Alex Light [Wed, 18 May 2016 21:17:09 +0000 (21:17 +0000)]
Merge "Add fake libart"
am:
49a4be8130
* commit '
49a4be81304d2292bb6bd67ddaabe759d9e8c273':
Add fake libart
Change-Id: Iacc59ada5b3323c81a8c70464f5634ab722c4f2b
Alex Light [Wed, 18 May 2016 21:05:41 +0000 (21:05 +0000)]
Merge "Add fake libart"
Dan Willemsen [Wed, 18 May 2016 20:55:07 +0000 (20:55 +0000)]
Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS" am:
ac7a7bb0ba
am:
611211acd4
* commit '
611211acd40bc02773d27568d4774d8061149c52':
Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS
Change-Id: I6744e92b392c02dfcbe2154d13823a5a0a3b7693
Dan Willemsen [Wed, 18 May 2016 20:52:31 +0000 (20:52 +0000)]
Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS"
am:
ac7a7bb0ba
* commit '
ac7a7bb0ba7b864a07ceb159dcd6a8b177866fb3':
Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS
Change-Id: I7e880084b72d90dc4de16fd674692b53b1e67de2
Treehugger Robot [Wed, 18 May 2016 20:45:19 +0000 (20:45 +0000)]
Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS"
Dan Willemsen [Wed, 18 May 2016 19:50:53 +0000 (12:50 -0700)]
Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS
We never use it for host modules, and all the target configurations use
the same linker argument. This matches Soong.
Change-Id: Ibcba9a4ce340c7a12306d1fee620a04027c0e292
Alex Klyubin [Wed, 18 May 2016 16:25:46 +0000 (16:25 +0000)]
Merge "Uncompress native libs only if they are compressed." into nyc-dev
am:
451b72438e
* commit '
451b72438e974a10f3f9062ced5d455d3234e4dd':
Uncompress native libs only if they are compressed.
Change-Id: I4c680cfb228774ce93e75c644e7eee5c40988399
TreeHugger Robot [Wed, 18 May 2016 16:17:17 +0000 (16:17 +0000)]
Merge "Uncompress native libs only if they are compressed." into nyc-dev
Alex Light [Fri, 15 Apr 2016 17:19:02 +0000 (10:19 -0700)]
Add fake libart
Bug:
27775991
Change-Id: I54cbdf2340dcfdd9b3973d9d10c8bd94492736fb
(cherry picked from commit
6da74d8f1f0a06366fe93b885dc26f53401ec6b4)
Dan Willemsen [Wed, 18 May 2016 00:43:02 +0000 (00:43 +0000)]
Merge "Remove make variables exported from Soong" am:
30b57cd7d5
am:
f85807f794
* commit '
f85807f794266ccebbcba8aaf2732b1fb945519d':
Remove make variables exported from Soong
Change-Id: I453366e23996f4b68acc5367146829050f00798e
Dan Willemsen [Wed, 18 May 2016 00:43:01 +0000 (00:43 +0000)]
Merge "Pass BUILD_HOST_static to Soong" am:
3b0990cbdc
am:
700b0f868e
* commit '
700b0f868e8200fb5c7c30b35155867606229247':
Pass BUILD_HOST_static to Soong
Change-Id: I0fddac56a5bf4feb5e5049b96c7d75912eb0d021
Dan Willemsen [Wed, 18 May 2016 00:40:31 +0000 (00:40 +0000)]
Merge "Remove make variables exported from Soong"
am:
30b57cd7d5
* commit '
30b57cd7d5459c69fbd4332b988b5e636b529f4d':
Remove make variables exported from Soong
Change-Id: I2b7a6baf5d8a8b3b0bb52e8fc4b16a5616f8f939
Dan Willemsen [Wed, 18 May 2016 00:40:30 +0000 (00:40 +0000)]
Merge "Pass BUILD_HOST_static to Soong"
am:
3b0990cbdc
* commit '
3b0990cbdc941b584fb3000f76607c2a8065b603':
Pass BUILD_HOST_static to Soong
Change-Id: I8292e35b7ca3fe14133b8675dbf8d6c54736e5aa
Dan Willemsen [Wed, 18 May 2016 00:36:46 +0000 (00:36 +0000)]
Merge "Remove make variables exported from Soong"
Treehugger Robot [Wed, 18 May 2016 00:33:07 +0000 (00:33 +0000)]
Merge "Pass BUILD_HOST_static to Soong"
Dan Willemsen [Tue, 17 May 2016 23:40:03 +0000 (16:40 -0700)]
Pass BUILD_HOST_static to Soong
Change-Id: I0ac43a1dedf20e5251e05f12d120d0e6e2e1b1ee
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
Alex Klyubin [Tue, 17 May 2016 20:33:34 +0000 (13:33 -0700)]
Uncompress native libs only if they are compressed.
This changes the build system to uncompress native libraries in
preinstalled APKs only if the libraries are actually compressed.
Previously, any preinstalled APK containing native libraries was
modified by having all native libraries removed from the APK and then
re-added to the APK in uncompressed form.
Bug:
27887819
Change-Id: I3db172133e141bb6282bf3ed7070b068a826724e
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 [Mon, 16 May 2016 08:42:58 +0000 (01:42 -0700)]
Remove make variables exported from Soong
These have all been strictly checked by Soong, so the values currently
match. Just remove them so that the make variables exported by Soong
will take over.
This also removes some of the GCC reconfiguration, since we haven't
implemented that in Soong. If it becomes useful in the future, we'll
implement it there.
Some things like TARGET_TOOCHAIN_ROOT can nearly be removed, but are
used before the Soong-exported make_vars.mk is loaded. In that case,
added to the clang cflags, so it can be removed once the cflags are
removed.
Others, like LLVM_PREBUILTS_VERSION are loaded even earlier -- in
envsetup.sh before we've even configured Soong. So for now, keep the
Make definition, and continue ensuring it's the same as the Soong
version.
Change-Id: I554b27062ac43610828a8c06d640d919a2dc21ca
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
OSDN Git Service
