OSDN Git Service
Tao Bao [Wed, 19 Aug 2015 02:46:41 +0000 (02:46 +0000)]
am
d88eaf02: am
123a7d38: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery."
* commit '
d88eaf025543c3e5360fb22f1d142133621b117e':
build: Don't call make_recovery_patch if there's no recovery.
Tao Bao [Wed, 19 Aug 2015 02:39:21 +0000 (02:39 +0000)]
am
123a7d38: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery."
* commit '
123a7d380ee29941639a1fce10ba2051d37f860b':
build: Don't call make_recovery_patch if there's no recovery.
Tao Bao [Wed, 19 Aug 2015 02:34:27 +0000 (02:34 +0000)]
Merge "build: Don't call make_recovery_patch if there's no recovery."
Konstantinos Menychtas [Wed, 19 Aug 2015 01:40:09 +0000 (01:40 +0000)]
am
956e4693: Increasing MIPS emulator system image size and user-data image size
* commit '
956e469327b1da4b635f20795ed48f6c36ba10d6':
Increasing MIPS emulator system image size and user-data image size
Tao Bao [Wed, 19 Aug 2015 01:03:56 +0000 (18:03 -0700)]
build: Don't call make_recovery_patch if there's no recovery.
Change-Id: Iea1bd529eca9cd607da3b420bc4287f95c18219d
Chih-hung Hsieh [Tue, 18 Aug 2015 22:22:23 +0000 (22:22 +0000)]
am
3eccd047: am
59c858fc: Merge "Remove special x86 flag that disables tail call optimization."
* commit '
3eccd04784d4a92e224bf0e6917f9a3b0353da1d':
Remove special x86 flag that disables tail call optimization.
Chih-hung Hsieh [Tue, 18 Aug 2015 22:17:31 +0000 (22:17 +0000)]
am
59c858fc: Merge "Remove special x86 flag that disables tail call optimization."
* commit '
59c858fc94d4cf45a260da81176372ca2a4b77ef':
Remove special x86 flag that disables tail call optimization.
Chih-hung Hsieh [Tue, 18 Aug 2015 22:11:03 +0000 (22:11 +0000)]
Merge "Remove special x86 flag that disables tail call optimization."
Ying Wang [Tue, 18 Aug 2015 21:51:40 +0000 (21:51 +0000)]
am
71327b90: am
42fa1948: Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."
* commit '
71327b90d8b2c2f9b1b3c993dcb907f3a225a7b8':
Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
Ying Wang [Tue, 18 Aug 2015 21:51:39 +0000 (21:51 +0000)]
am
f526c169: (-s ours) am
c3dcb6c0: Merge "Consolidate the nanopb-c and regular protobuf build rules."
* commit '
f526c169efd3da99e2fa01d76e4efec0f2f4f36a':
Consolidate the nanopb-c and regular protobuf build rules.
Ying Wang [Tue, 18 Aug 2015 21:41:05 +0000 (21:41 +0000)]
am
42fa1948: Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."
* commit '
42fa19482abbcebcb2ab563084b7ac1969553fe9':
Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
Ying Wang [Tue, 18 Aug 2015 21:41:03 +0000 (21:41 +0000)]
am
c3dcb6c0: Merge "Consolidate the nanopb-c and regular protobuf build rules."
* commit '
c3dcb6c06bd2fbe816a918e9c3b099669bbeb5b5':
Consolidate the nanopb-c and regular protobuf build rules.
Ying Wang [Tue, 18 Aug 2015 21:35:42 +0000 (21:35 +0000)]
Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."
Ying Wang [Tue, 18 Aug 2015 21:35:37 +0000 (21:35 +0000)]
Merge "Consolidate the nanopb-c and regular protobuf build rules."
Ying Wang [Wed, 8 Apr 2015 16:54:34 +0000 (09:54 -0700)]
Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
Bug:
20093047
Change-Id: I787925fde97d1a3965cb8a9bf012f3c5a45a6aed
Ying Wang [Tue, 7 Apr 2015 18:59:34 +0000 (11:59 -0700)]
Consolidate the nanopb-c and regular protobuf build rules.
Bug:
20093047
Change-Id: I38ebd748aacce6d215403da481ad04833810a995
Konstantinos Menychtas [Tue, 18 Aug 2015 17:14:12 +0000 (10:14 -0700)]
Increasing MIPS emulator system image size and user-data image size
Size increase taken as a precaution against recent built breakage
due to lack of space on a number of targets (e.g. x86, ARM64).
System and user-data image sizes set to match currently most common
setup for the emulator: system image: 1.25gb, user-data image 700mb.
Change-Id: I7118eb26dd78f5fa9e4f0006e15c8d47dee8e28c
Tao Bao [Tue, 18 Aug 2015 17:25:09 +0000 (17:25 +0000)]
am
5d690a37: am
ab9a3588: Merge "Revise stash for BBOTAs when needed."
* commit '
5d690a37d4b3b33dee1cfc2a64b66ed4e9c03460':
Revise stash for BBOTAs when needed.
Tao Bao [Tue, 18 Aug 2015 17:21:09 +0000 (17:21 +0000)]
am
ab9a3588: Merge "Revise stash for BBOTAs when needed."
* commit '
ab9a3588011ebe62eb18e425de02a50fe919b645':
Revise stash for BBOTAs when needed.
Tao Bao [Tue, 18 Aug 2015 16:59:05 +0000 (16:59 +0000)]
Merge "Revise stash for BBOTAs when needed."
Dan Willemsen [Tue, 18 Aug 2015 04:43:04 +0000 (04:43 +0000)]
am
48d95e75: am
05d97fe7: Merge "Remove legacy windows platform build support"
* commit '
48d95e752536dc7a81c141e435e8a90b7929cf02':
Remove legacy windows platform build support
Dan Willemsen [Tue, 18 Aug 2015 04:37:09 +0000 (04:37 +0000)]
am
05d97fe7: Merge "Remove legacy windows platform build support"
* commit '
05d97fe723ea376edb5fe6b12535485311a32418':
Remove legacy windows platform build support
Dan Willemsen [Tue, 18 Aug 2015 04:31:07 +0000 (04:31 +0000)]
Merge "Remove legacy windows platform build support"
Dan Willemsen [Tue, 18 Aug 2015 03:50:48 +0000 (20:50 -0700)]
resolved conflicts for merge of
05fae7e0 to mnc-dev-plus-aosp
Change-Id: I9f0f1169839afabc7ec7e439b668798e2cd111a3
Dan Willemsen [Tue, 18 Aug 2015 03:35:44 +0000 (03:35 +0000)]
am
e6510750: Merge "Use repeatable timestamps"
* commit '
e65107508adbea88fcc1ec51dcf28d4216365753':
Use repeatable timestamps
Dan Willemsen [Tue, 18 Aug 2015 03:30:11 +0000 (03:30 +0000)]
Merge "Use repeatable timestamps"
Ying Wang [Tue, 18 Aug 2015 00:18:48 +0000 (00:18 +0000)]
am
808f0541: am
77128117: Merge "Set up dependency on ADDRESS_SANITIZER_LINKER"
* commit '
808f0541bba725c4fdc9d2b425a305eeeb024e39':
Set up dependency on ADDRESS_SANITIZER_LINKER
Ying Wang [Tue, 18 Aug 2015 00:11:11 +0000 (00:11 +0000)]
am
77128117: Merge "Set up dependency on ADDRESS_SANITIZER_LINKER"
* commit '
77128117d8b7811b86ba89e963f8a96cc6c55a6b':
Set up dependency on ADDRESS_SANITIZER_LINKER
Ying Wang [Tue, 18 Aug 2015 00:06:52 +0000 (00:06 +0000)]
Merge "Set up dependency on ADDRESS_SANITIZER_LINKER"
Ying Wang [Mon, 17 Aug 2015 23:13:24 +0000 (16:13 -0700)]
Set up dependency on ADDRESS_SANITIZER_LINKER
Set up dependency on ADDRESS_SANITIZER_LINKER if address sanitizer is
enabled.
Bug:
22850550
Change-Id: I736fe1d4db9594edf9e82ae96e4631887881dfa5
Dan Albert [Mon, 17 Aug 2015 22:46:38 +0000 (22:46 +0000)]
am
9496ef90: am
c0018b04: Merge "Add BUILD(_HOST)?_FUZZ_TEST."
* commit '
9496ef903ff9402859ac82cc339708c15fcd30f6':
Add BUILD(_HOST)?_FUZZ_TEST.
Dan Albert [Mon, 17 Aug 2015 22:39:25 +0000 (22:39 +0000)]
am
c0018b04: Merge "Add BUILD(_HOST)?_FUZZ_TEST."
* commit '
c0018b04e984180122ab615d8dbea09a3230ef7f':
Add BUILD(_HOST)?_FUZZ_TEST.
Dan Albert [Mon, 17 Aug 2015 22:32:58 +0000 (22:32 +0000)]
Merge "Add BUILD(_HOST)?_FUZZ_TEST."
Dan Albert [Thu, 30 Jul 2015 23:56:30 +0000 (16:56 -0700)]
Add BUILD(_HOST)?_FUZZ_TEST.
These are tests that use LLVM's libFuzzer for testing with a
sanitizer.
Bug: http://b/
22850550
Change-Id: I6eeaff7877b7dd0c30f8910c6f27f5278b27a83d
Elliott Hughes [Mon, 17 Aug 2015 20:38:41 +0000 (20:38 +0000)]
am
a9a433bd: am
648f2011: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in build."
* commit '
a9a433bdcde19b3262f5eab6f4ee59b88673ec07':
Replace HAVE_MS_C_RUNTIME with _WIN32 in build.
Elliott Hughes [Mon, 17 Aug 2015 20:31:52 +0000 (20:31 +0000)]
am
648f2011: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in build."
* commit '
648f2011a6fcf1fcb4a67b5d49a1c9d29877bc17':
Replace HAVE_MS_C_RUNTIME with _WIN32 in build.
Elliott Hughes [Mon, 17 Aug 2015 20:25:36 +0000 (20:25 +0000)]
Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in build."
Dan Albert [Mon, 17 Aug 2015 20:24:05 +0000 (20:24 +0000)]
am
8d61be6c: am
f9b75b1b: Merge "Don\'t filter on a non-existent variable."
* commit '
8d61be6c781277ae3f5423c805092220a961b102':
Don't filter on a non-existent variable.
Dan Albert [Mon, 17 Aug 2015 20:19:30 +0000 (20:19 +0000)]
am
f9b75b1b: Merge "Don\'t filter on a non-existent variable."
* commit '
f9b75b1b24d985c873e548d4fd7945a6cdd99323':
Don't filter on a non-existent variable.
Dan Albert [Mon, 17 Aug 2015 20:16:01 +0000 (20:16 +0000)]
Merge "Don't filter on a non-existent variable."
Elliott Hughes [Mon, 17 Aug 2015 19:37:37 +0000 (12:37 -0700)]
Replace HAVE_MS_C_RUNTIME with _WIN32 in build.
Change-Id: Iebca0c4eab975c4bebcd3658baefd85c51890db4
Dan Willemsen [Thu, 13 Aug 2015 21:31:36 +0000 (14:31 -0700)]
Remove legacy windows platform build support
We still support HOST_OS=windows for the SDK host tools cross-builds, but
that's only when USE_MINGW is set when running under linux.
Change-Id: I37da87dc9fbbd69ba10ce4d7f2668ab3f6482d92
Justin Klaassen [Mon, 17 Aug 2015 18:36:57 +0000 (18:36 +0000)]
Merge "Revert "Revert "Switch from Calculator to ExactCalculator""" into mnc-dev-plus-aosp
Tao Bao [Mon, 17 Aug 2015 17:55:34 +0000 (17:55 +0000)]
am
3b409d56: am
dae6455c: Merge "Add an option to include a full bootloader in incremental OTA."
* commit '
3b409d56f4e142dd4afc7e11bbe4502123a46f31':
Add an option to include a full bootloader in incremental OTA.
Tao Bao [Mon, 17 Aug 2015 17:48:43 +0000 (17:48 +0000)]
am
dae6455c: Merge "Add an option to include a full bootloader in incremental OTA."
* commit '
dae6455c95a30ec2742b54ce3c8a4a45b1aa65f2':
Add an option to include a full bootloader in incremental OTA.
Tao Bao [Mon, 17 Aug 2015 17:38:01 +0000 (17:38 +0000)]
Merge "Add an option to include a full bootloader in incremental OTA."
Dan Albert [Mon, 17 Aug 2015 17:36:09 +0000 (10:36 -0700)]
Don't filter on a non-existent variable.
This used to be used for aarch64
(https://android-review.googlesource.com/#/c/80126/), but has since
been removed and now does nothing. This was then reimplemented more
generally with my_illegal_flags
(https://android-review.googlesource.com/#/c/166405/). Drop
*GLOBAL_UNSUPPORTED_CFLAGS in favor of that.
Change-Id: I3347726dd92f9d3a16783e0d9d3b685a828400b4
leozwang [Fri, 14 Aug 2015 17:57:58 +0000 (10:57 -0700)]
Add an option to include a full bootloader in incremental OTA.
Bug:
23101469
Change-Id: Iac466b83f789f10d26e8d289dce766cf0d05148b
(cherry picked from commit
c1324751e79b23a63ea494f4bc784446c8f32435)
Tao Bao [Mon, 17 Aug 2015 16:45:13 +0000 (09:45 -0700)]
Revise stash for BBOTAs when needed.
When generating incremental BBOTAs (v2 and above), we need to ensure
that the needed runtime stash is below the given threshold. If it's
running out of space on /cache, we replace the command that uses a
stash with a "new" command instead.
This may increase the OTA package size, since it is carrying more full
blocks instead of patches. It gets even worse for large files that span
a number of blocks, because currently we will store all the blocks for
the file as "new" blocks if stashing cannot be satisfied. We may further
optimize by splitting them into smaller chunks so that most of them can
still be stashed.
Bug:
22430577
Change-Id: I5a49e361adc7d3d41de2e9c08ee9b08c1e6c091a
Dirk Dougherty [Sun, 16 Aug 2015 22:31:27 +0000 (22:31 +0000)]
am
6a8f88cd: adjust image placement for m hero on medium screens.
* commit '
6a8f88cdec931470256ade35ffe6b8097425e36f':
adjust image placement for m hero on medium screens.
Dirk Dougherty [Sat, 15 Aug 2015 04:18:36 +0000 (21:18 -0700)]
adjust image placement for m hero on medium screens.
Change-Id: I644837bf151549ad8dbbfb194f8e699233362933
Stephen Hines [Sat, 15 Aug 2015 02:18:58 +0000 (02:18 +0000)]
am
5d17a7e2: am
2e08cb6e: Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
* commit '
5d17a7e2adf505fd7a97782f54856c86a237369d':
Add -mfpu=neon-vfpv4 if cpu is krait
Yang Ni [Sat, 15 Aug 2015 02:18:57 +0000 (02:18 +0000)]
am
dcfb0c80: am
36600a6b: Merge "Include target api version in build system for rscpp."
* commit '
dcfb0c8018ec9e81fa79f3251a3d49a4cc90ddf4':
Include target api version in build system for rscpp.
Stephen Hines [Sat, 15 Aug 2015 02:12:46 +0000 (02:12 +0000)]
am
2e08cb6e: Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
* commit '
2e08cb6e1bf90b0950c875132d2bf37b71d03fbb':
Add -mfpu=neon-vfpv4 if cpu is krait
Stephen Hines [Sat, 15 Aug 2015 02:04:55 +0000 (02:04 +0000)]
Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
Yang Ni [Fri, 14 Aug 2015 18:46:18 +0000 (18:46 +0000)]
am
36600a6b: Merge "Include target api version in build system for rscpp."
* commit '
36600a6bf9b3b79327785cd740a909d3920d6519':
Include target api version in build system for rscpp.
Yang Ni [Fri, 14 Aug 2015 18:39:47 +0000 (18:39 +0000)]
Merge "Include target api version in build system for rscpp."
Dan Albert [Fri, 14 Aug 2015 01:10:46 +0000 (01:10 +0000)]
am
5e9f4912: am
578acca4: Merge "Link librt on the host when using sanitizers."
* commit '
5e9f491218721adecfab6ea0178cd1e4c6723a87':
Link librt on the host when using sanitizers.
Dan Albert [Fri, 14 Aug 2015 01:05:03 +0000 (01:05 +0000)]
am
578acca4: Merge "Link librt on the host when using sanitizers."
* commit '
578acca4e27511900eefc2f65be3e88f9127660c':
Link librt on the host when using sanitizers.
Dan Albert [Fri, 14 Aug 2015 00:59:52 +0000 (00:59 +0000)]
Merge "Link librt on the host when using sanitizers."
Dan Albert [Fri, 14 Aug 2015 00:25:10 +0000 (17:25 -0700)]
Link librt on the host when using sanitizers.
The sanitizers now use shared memory.
Change-Id: Ie8fa6690374eda08ee4138b68fd628ebbfa2d0c8
Noah Presler [Fri, 14 Aug 2015 00:04:10 +0000 (17:04 -0700)]
Include target api version in build system for rscpp.
b/
23161320
Change-Id: Ibc23309abed092e7648168fbf4b80891a44929a6
Joe Fernandez [Thu, 13 Aug 2015 23:12:15 +0000 (23:12 +0000)]
am
71e0a80c: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
* commit '
71e0a80c2c2fdc26bb014685eebb874aa40f782d':
doc change: Add hero image for m and css for landing pages.
Joe Fernandez [Thu, 13 Aug 2015 23:02:37 +0000 (23:02 +0000)]
Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
Tao Bao [Thu, 13 Aug 2015 22:31:27 +0000 (22:31 +0000)]
am
3a2e91ca: am
8765fca2: Merge "Free the stash after its use in BBOTA v2."
* commit '
3a2e91cad7ec1309c07e9d96d572c6a0bed52346':
Free the stash after its use in BBOTA v2.
Tao Bao [Thu, 13 Aug 2015 22:26:17 +0000 (22:26 +0000)]
am
8765fca2: Merge "Free the stash after its use in BBOTA v2."
* commit '
8765fca2f6013fe9d82ff00729089c98921bfb52':
Free the stash after its use in BBOTA v2.
Tao Bao [Thu, 13 Aug 2015 22:22:16 +0000 (22:22 +0000)]
Merge "Free the stash after its use in BBOTA v2."
Tao Bao [Thu, 13 Aug 2015 21:44:15 +0000 (14:44 -0700)]
Free the stash after its use in BBOTA v2.
In BBOTA v2, the stash size computation is inaccurate. A stash will be
used only once, so we deduct its size from stashed_blocks right after
its use. However, the stash doesn't actually get freed until being
overwritten by another stash or destroyed at the end of an update. This
leads to OTA failures due to insufficient space on /cache. This CL
changes the BBOTA v2 script to generate an explicit free right after
its use.
Bug:
23119955
Change-Id: Icdd8352bb0ff778945937c870990a888c7a4d38b
Dirk Dougherty [Thu, 13 Aug 2015 19:37:34 +0000 (12:37 -0700)]
doc change: Add hero image for m and css for landing pages.
Change-Id: I52ddba716eebf821f8f5dbd888d6e3519f4284d4
Justin Klaassen [Thu, 13 Aug 2015 19:13:46 +0000 (19:13 +0000)]
Revert "Revert "Switch from Calculator to ExactCalculator""
This reverts commit
455ffaafcd5b6d0296bfa6143baccb01c84e2382.
Bug:
23186109
Change-Id: If768c4c85b8dbf1ffe881eca3412d92150fb019f
Chris Banes [Thu, 13 Aug 2015 17:36:54 +0000 (17:36 +0000)]
am
743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
* commit '
743938fb0d4f56d7d009486fb90891eab9b50897':
Make sure only AppCompat (not it's tests) are in the docs
Chris Banes [Thu, 13 Aug 2015 17:28:32 +0000 (17:28 +0000)]
Merge "Make sure only AppCompat (not it's tests) are in the docs" into mnc-dev
Dan Albert [Thu, 13 Aug 2015 17:02:13 +0000 (17:02 +0000)]
am
2c00d629: am
727b462a: Merge "Never allow -w."
* commit '
2c00d62940e7f88b2168ccf3a29a1d3e84f59bfa':
Never allow -w.
Dan Albert [Thu, 13 Aug 2015 16:52:55 +0000 (16:52 +0000)]
am
727b462a: Merge "Never allow -w."
* commit '
727b462a92635665ce636c63123078a970654480':
Never allow -w.
Dan Albert [Thu, 13 Aug 2015 16:48:18 +0000 (16:48 +0000)]
Merge "Never allow -w."
Mike Dodd [Thu, 13 Aug 2015 15:21:46 +0000 (15:21 +0000)]
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.
Mike Dodd [Thu, 13 Aug 2015 15:16:38 +0000 (15:16 +0000)]
Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
Neil Fuller [Thu, 13 Aug 2015 10:51:04 +0000 (10:51 +0000)]
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
Neil Fuller [Thu, 13 Aug 2015 10:46:46 +0000 (10:46 +0000)]
am
bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes"
* commit '
bc7680c4d7a94cfafcc3c925f0fbf134bc1dfcb8':
Include the okhttp.jar when compiling against internal classes
Neil Fuller [Thu, 13 Aug 2015 10:40:39 +0000 (10:40 +0000)]
Merge "Include the okhttp.jar when compiling against internal classes"
Chris Banes [Thu, 13 Aug 2015 08:38:12 +0000 (09:38 +0100)]
Make sure only AppCompat (not it's tests) are in the docs
BUG:
23169683
Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
Dianne Hackborn [Thu, 13 Aug 2015 00:53:51 +0000 (00:53 +0000)]
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
Dianne Hackborn [Thu, 13 Aug 2015 00:46:58 +0000 (00:46 +0000)]
Merge "Fix issie #
23116383: Include security patch level in Settings" into mnc-dev
Nick Kralevich [Thu, 13 Aug 2015 00:00:36 +0000 (00:00 +0000)]
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
Nick Kralevich [Wed, 12 Aug 2015 23:53:50 +0000 (23:53 +0000)]
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
Nick Kralevich [Wed, 12 Aug 2015 23:46:28 +0000 (23:46 +0000)]
Merge changes from topic 'file_contexts.bin'
* changes:
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
Dianne Hackborn [Wed, 12 Aug 2015 23:11:20 +0000 (16:11 -0700)]
Fix issie #
23116383: Include security patch level in Settings
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
Mike Dodd [Tue, 11 Aug 2015 20:14:09 +0000 (13:14 -0700)]
Include new AOSP messaging app in base AOSP telephony builds.
b/
23110861
Change-Id: I31ba32f3341c77ba6eb083a189dffa1a08c6c8d4
Dan Albert [Wed, 12 Aug 2015 21:54:16 +0000 (14:54 -0700)]
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
Ian Pedowitz [Wed, 12 Aug 2015 19:51:22 +0000 (19:51 +0000)]
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
Ian Pedowitz [Wed, 12 Aug 2015 19:41:54 +0000 (19:41 +0000)]
Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 18:58:54 +0000 (18:58 +0000)]
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."
Mike Dodd [Wed, 12 Aug 2015 18:53:47 +0000 (18:53 +0000)]
Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 18:48:45 +0000 (18:48 +0000)]
Revert "Include new AOSP messaging app in base builds."
This reverts commit
a8b0905e165448857ad45d1633c545c53bd53a5e.
Change-Id: Ia8b8eaf6576937907b073ad97593440e114c0b6f
Ian Pedowitz [Wed, 12 Aug 2015 18:11:55 +0000 (11:11 -0700)]
Removing VisualizationWallpapers as it does not comply with API 23 rules
Bug:
23021372
Change-Id: Ib985ac99bd9068c21f8a1c48e77c72426f69ea79
Mike Dodd [Wed, 12 Aug 2015 17:35:04 +0000 (17:35 +0000)]
am
02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev
* commit '
02389bf940f751ffb85c8c2187a7039f0c18dad1':
Include new AOSP messaging app in base builds.
Mike Dodd [Wed, 12 Aug 2015 17:01:24 +0000 (17:01 +0000)]
Merge "Include new AOSP messaging app in base builds." into mnc-dev
Neil Fuller [Tue, 11 Aug 2015 12:48:34 +0000 (13:48 +0100)]
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
Tao Bao [Wed, 12 Aug 2015 07:04:05 +0000 (07:04 +0000)]
am
11cf92aa: am
1dca55fd: skip the merge of
67e7c661 to lmp-mr1-ub-dev
* commit '
11cf92aa37b9f51176a2055b1ff97b6211404103':
Add support for clobbered blocks
Dan Willemsen [Tue, 11 Aug 2015 22:25:12 +0000 (15:25 -0700)]
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