Chris Banes
743938fb0d
Merge "Make sure only AppCompat (not it's tests) are in the docs" into mnc-dev
2015-08-13 17:28:32 +00:00
Dan Albert
dc0e7244a6
am 2c00d629
: am 727b462a
: Merge "Never allow -w."
...
* commit '2c00d62940e7f88b2168ccf3a29a1d3e84f59bfa':
Never allow -w.
2015-08-13 17:02:13 +00:00
Dan Albert
2c00d62940
am 727b462a
: Merge "Never allow -w."
...
* commit '727b462a92635665ce636c63123078a970654480':
Never allow -w.
2015-08-13 16:52:55 +00:00
Dan Albert
727b462a92
Merge "Never allow -w."
2015-08-13 16:48:18 +00:00
Mike Dodd
44af8f9655
am 5bf35d06
: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
...
* commit '5bf35d0685ba62ded55cc63f3dd2f23b82cc645d':
Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:21:46 +00:00
Mike Dodd
5bf35d0685
Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
2015-08-13 15:16:38 +00:00
Neil Fuller
53d1632681
am 5f198440
: am bc7680c4
: Merge "Include the okhttp.jar when compiling against internal classes"
...
* commit '5f19844067af27906828af7caed8e8b9c09cac4a':
Include the okhttp.jar when compiling against internal classes
2015-08-13 10:51:04 +00:00
Neil Fuller
5f19844067
am bc7680c4
: Merge "Include the okhttp.jar when compiling against internal classes"
...
* commit 'bc7680c4d7a94cfafcc3c925f0fbf134bc1dfcb8':
Include the okhttp.jar when compiling against internal classes
2015-08-13 10:46:46 +00:00
Neil Fuller
bc7680c4d7
Merge "Include the okhttp.jar when compiling against internal classes"
2015-08-13 10:40:39 +00:00
Chris Banes
b916a5bcbc
Make sure only AppCompat (not it's tests) are in the docs
...
BUG: 23169683
Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
2015-08-13 10:42:02 +01:00
Dianne Hackborn
42ebdfc574
am 25abc5a3
: Merge "Fix issie #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
Fix issie #23116383 : Include security patch level in Settings
2015-08-13 00:53:51 +00:00
Dianne Hackborn
25abc5a38e
Merge "Fix issie #23116383 : Include security patch level in Settings" into mnc-dev
2015-08-13 00:46:58 +00:00
Nick Kralevich
420662b9cd
am c85364c9
: am 5f79bcdd
: Merge changes from topic \'file_contexts.bin\'
...
* commit 'c85364c9c91961461a6d81a37c8b30b34b02383b':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-13 00:00:36 +00:00
Nick Kralevich
c85364c9c9
am 5f79bcdd
: Merge changes from topic \'file_contexts.bin\'
...
* commit '5f79bcdd070f4069cd60bbe68430ee172575f9e2':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-12 23:53:50 +00:00
Nick Kralevich
5f79bcdd07
Merge changes from topic 'file_contexts.bin'
...
* changes:
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-12 23:46:28 +00:00
Dianne Hackborn
e593e5c42a
Fix issie #23116383 : Include security patch level in Settings
...
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
2015-08-12 16:29:08 -07:00
Mike Dodd
f29b5bd380
Include new AOSP messaging app in base AOSP telephony builds.
...
b/23110861
Change-Id: I31ba32f3341c77ba6eb083a189dffa1a08c6c8d4
2015-08-12 15:44:04 -07:00
Dan Albert
df3fd1d128
Never allow -w.
...
Apparently -w will disable all warnings on GCC regardless of ordering
(clang will still respect ordering so warnings that are enabled after
-w are still respected). This is insane. Strip -w from the cflags.
Anyone that wants this flag should be turning off the specific
warnings (or just fix them), not disabling all warnings.
Change-Id: I2ba065637dfdc192921da4d9adbdc63b728c166f
2015-08-12 14:54:16 -07:00
Ian Pedowitz
3584355bb9
am a0372e20
: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
...
* commit 'a0372e20a24283002c2d27b372194d88e1983a3f':
Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 19:51:22 +00:00
Ian Pedowitz
a0372e20a2
Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
2015-08-12 19:41:54 +00:00
Mike Dodd
5e1a991973
am 745d11cc
: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
...
* commit '745d11ccd077060b5d3b0e3e53682e8c1f85dd66':
Revert "Include new AOSP messaging app in base builds."
2015-08-12 18:58:54 +00:00
Mike Dodd
745d11ccd0
Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
2015-08-12 18:53:47 +00:00
Mike Dodd
018500efea
Revert "Include new AOSP messaging app in base builds."
...
This reverts commit a8b0905e16
.
Change-Id: Ia8b8eaf6576937907b073ad97593440e114c0b6f
2015-08-12 18:48:45 +00:00
Ian Pedowitz
68c62e78ad
Removing VisualizationWallpapers as it does not comply with API 23 rules
...
Bug: 23021372
Change-Id: Ib985ac99bd9068c21f8a1c48e77c72426f69ea79
2015-08-12 11:11:55 -07:00
Mike Dodd
5d5a3e0d90
am 02389bf9
: Merge "Include new AOSP messaging app in base builds." into mnc-dev
...
* commit '02389bf940f751ffb85c8c2187a7039f0c18dad1':
Include new AOSP messaging app in base builds.
2015-08-12 17:35:04 +00:00
Mike Dodd
02389bf940
Merge "Include new AOSP messaging app in base builds." into mnc-dev
2015-08-12 17:01:24 +00:00
Neil Fuller
f39a25bc28
Include the okhttp.jar when compiling against internal classes
...
If LOCAL_SDK_VERSION is unset we were compiling against
core-libart but not okhttp.
okhttp should be an implementation detail but
android.net.http.HttpResponseCache implements
com.android.okhttp.OkCacheContainer.
The OpenJDK 8 version of of javac now requires all interfaces of
implemented classes be made available at compile time even with
-source 1.7 -target 1.7.
This is not an issue when compiling against the android.jar because
the implementation of HttpResponseCache in the android.jar does not
implement com.android.okhttp.OkCacheContainer.
Bug: 23099154
Change-Id: I3fa1d0f73535b396623fed953cfc71189b797849
2015-08-12 09:30:58 +01:00
Tao Bao
a2191764f3
am 11cf92aa
: am 1dca55fd
: skip the merge of 67e7c661
to lmp-mr1-ub-dev
...
* commit '11cf92aa37b9f51176a2055b1ff97b6211404103':
Add support for clobbered blocks
2015-08-12 07:04:05 +00:00
Dan Willemsen
ccc933e97b
Use repeatable timestamps
...
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.
It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.
Bug: 23117013
Change-Id: I7c17a32b794a5adf40b9cd69136fb0ff9f6084ec
2015-08-12 00:02:20 -07:00
Tao Bao
11cf92aa37
am 1dca55fd
: skip the merge of 67e7c661
to lmp-mr1-ub-dev
...
* commit '1dca55fde512f1758690fb563f1ffc9cec5f7271':
Add support for clobbered blocks
2015-08-12 06:55:21 +00:00
Tao Bao
1dca55fde5
skip the merge of 67e7c661
to lmp-mr1-ub-dev
...
The change (007979ee
) was cherry-picked from mnc-dev back to
lmp-mr1-dev. It doesn't need to flow further.
Change-Id: I0469708f1f3a0863f194a5820c7aeda4d163cbb7
2015-08-11 23:22:37 -07:00
Tao Bao
67e7c66124
am 007979ee
: Add support for clobbered blocks
...
* commit '007979ee7543a396d97b3e9ada21aca44d503597':
Add support for clobbered blocks
2015-08-12 05:18:37 +00:00
Tao Bao
007979ee75
Add support for clobbered blocks
...
In ext4 filesystems, some blocks might be changed even being mounted
R/O, such as the superblock (block 0). We need to exclude such blocks
from integrity verification. Plus such blocks should always be
written to the target by copying instead of patching.
Bug: http://b/20939131
Change-Id: If9efab3d7a0071a87b4d4297daf7963c3b818afe
(cherry picked from commit ff7778166b
)
2015-08-11 21:02:45 -07:00
Gina Dimino
505186cb7a
am 291232ae
: am 8f301ff1
: Merge "Docs: Rename content-footer-text plus remove whitespace."
...
* commit '291232aea7130c96a87ca52df0eb1e0e742b1826':
Docs: Rename content-footer-text plus remove whitespace.
2015-08-12 03:21:10 +00:00
Gina Dimino
291232aea7
am 8f301ff1
: Merge "Docs: Rename content-footer-text plus remove whitespace."
...
* commit '8f301ff10d037e4305775c55ce9be6fcb93a8134':
Docs: Rename content-footer-text plus remove whitespace.
2015-08-12 03:14:01 +00:00
Gina Dimino
8f301ff10d
Merge "Docs: Rename content-footer-text plus remove whitespace."
2015-08-12 03:05:59 +00:00
Dan Willemsen
8478f7abbd
resolved conflicts for merge of b184ec2a
to mnc-dev-plus-aosp
...
Change-Id: I6178127dd19ee553c15343fc0120af9463b7ac4d
2015-08-11 18:31:59 -07:00
Dan Willemsen
33f46daa22
resolved conflicts for merge of c576c08f
to mnc-dev-plus-aosp
...
Change-Id: I2d28518ac5a26de7c5df9a2e3a1902e880155101
2015-08-11 18:21:43 -07:00
Dan Willemsen
b184ec2a82
am 608aa91d
: Merge "Revert "Use repeatable timestamps""
...
* commit '608aa91db7ef1c131e2c49b0ffd39851ff2b6e9d':
Revert "Use repeatable timestamps"
2015-08-12 01:07:44 +00:00
Dan Willemsen
608aa91db7
Merge "Revert "Use repeatable timestamps""
2015-08-12 01:02:19 +00:00
Dan Willemsen
92026f2d36
Revert "Use repeatable timestamps"
...
OSX `date` doesn't understand -d
This reverts commit 13ba6e00f4
.
Change-Id: I5970032ff02cc07bd3b087e1eeb5f19b1e4194b4
2015-08-12 01:00:19 +00:00
Dan Willemsen
c576c08fd5
am 671b8ff5
: Merge "Use repeatable timestamps"
...
* commit '671b8ff5457472631f805f3230273e5e8121b28a':
Use repeatable timestamps
2015-08-12 00:55:21 +00:00
Dan Willemsen
671b8ff545
Merge "Use repeatable timestamps"
2015-08-12 00:49:26 +00:00
Dan Willemsen
13ba6e00f4
Use repeatable timestamps
...
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.
It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.
Bug: 23117013
Change-Id: I880ef103a26bca86bd7bf42d58e62e740a6228c8
2015-08-11 17:08:03 -07:00
Ying Wang
2bf0ba2dcf
am 23cb26c7
: am 20febe3d
: Merge "Don\'t build otapackage on Mac."
...
* commit '23cb26c7bfa1714db3b31b166be49a0aa46e4a08':
Don't build otapackage on Mac.
2015-08-11 23:23:39 +00:00
Ying Wang
23cb26c7bf
am 20febe3d
: Merge "Don\'t build otapackage on Mac."
...
* commit '20febe3d839131e2cde795ae2a36f93c5ac1c378':
Don't build otapackage on Mac.
2015-08-11 23:14:52 +00:00
Ying Wang
20febe3d83
Merge "Don't build otapackage on Mac."
2015-08-11 22:49:25 +00:00
Ian Pedowitz
c3bc0b112c
resolved conflicts for merge of e5a63158
to mnc-dev-plus-aosp
...
Change-Id: Ifcbf55d0f4a158602867c01546f4c0f7e668697f
2015-08-11 15:06:29 -07:00
Ian Pedowitz
e5a631585a
Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
2015-08-11 21:54:17 +00:00
Clay Murphy
f8cb77dfd2
am 71a33c4d
: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11
) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
...
* commit '71a33c4d5b010757423980b90681445ca2bb2be0':
Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11
) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
2015-08-11 21:04:31 +00:00