OSDN Git Service
The Android Automerger [Thu, 3 Mar 2016 08:03:59 +0000 (00:03 -0800)]
"NRC63"
The Android Automerger [Thu, 3 Mar 2016 08:00:38 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
Ying Wang [Thu, 3 Mar 2016 00:55:24 +0000 (00:55 +0000)]
Merge "Calls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES" into nyc-dev
The Android Automerger [Wed, 2 Mar 2016 21:01:35 +0000 (13:01 -0800)]
"NRC62B"
Stuart Scott [Wed, 2 Mar 2016 16:42:41 +0000 (08:42 -0800)]
Add cts_v2 phony target for temporary build fix.
Change-Id: I770dc800dbcdff2c31e370410b32e2ee079f308b
Ying Wang [Wed, 2 Mar 2016 18:19:25 +0000 (18:19 +0000)]
Merge "Clean generated source dir if .proto/.rs is gonee." into nyc-dev
Ying Wang [Wed, 2 Mar 2016 18:03:30 +0000 (18:03 +0000)]
Merge "Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS" into nyc-dev
Stuart Scott [Wed, 2 Mar 2016 16:42:41 +0000 (08:42 -0800)]
Add cts_v2 phony target for temporary build fix.
Change-Id: I770dc800dbcdff2c31e370410b32e2ee079f308b
The Android Automerger [Wed, 2 Mar 2016 08:04:42 +0000 (00:04 -0800)]
"NRC62"
The Android Automerger [Wed, 2 Mar 2016 08:00:38 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
Ying Wang [Wed, 2 Mar 2016 06:05:25 +0000 (22:05 -0800)]
Clean generated source dir if .proto/.rs is gonee.
Similar to how we clean the generated source dir if .aidl becomes
obsolete.
Bug:
26688474
Change-Id: I66c5b6d6513259b5f4f4bac84f384f4bf953d82a
Ying Wang [Wed, 2 Mar 2016 04:14:52 +0000 (20:14 -0800)]
Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS
So that we can disable only one in multilib modules.
Bug:
27442756
Change-Id: I4ca379fac997f9165c47cb93d34bf1f483f5a241
Tao Bao [Tue, 1 Mar 2016 23:08:51 +0000 (15:08 -0800)]
resolve merge conflicts of
9baa993c07 to nyc-dev
Change-Id: Ifcfb2da03662ef1b6677c0974605189e2a8e3d20
Tao Bao [Tue, 1 Mar 2016 22:56:23 +0000 (22:56 +0000)]
releasetools: Add --oem_no_mount option.
am:
df4cb0b2c1
* commit '
df4cb0b2c1e6d1cf5973e9008bd6dc15bd590ac0':
releasetools: Add --oem_no_mount option.
The Android Automerger [Tue, 1 Mar 2016 22:34:26 +0000 (14:34 -0800)]
"NRC61B"
Stephen Hines [Tue, 1 Mar 2016 21:36:15 +0000 (21:36 +0000)]
Merge changes I769ed278,I99cb69ea,I57bcbed0,I6e51e51f,Iab2d36e2 into nyc-dev
* changes:
Remove debug statement
Tell Soong about HOST_CROSS_*
Update to use the latest clang-
2629532.
Use newest clang static analyzers.
Add 64-bit windows cross-compiles
Ying Wang [Tue, 1 Mar 2016 20:06:47 +0000 (12:06 -0800)]
Calls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES
We expect to build the module's own packare-res.apk from the
LOCAL_STATIC_ANDROID_LIBRARIES in this case.
Bug:
25958912
Change-Id: I4d0294c867f5fb636983d630493a3b188279cae9
Dimitry Ivanov [Tue, 1 Mar 2016 17:50:00 +0000 (17:50 +0000)]
Merge "Add options for dynamic linker developer warnings" into nyc-dev
Adam Lesinski [Tue, 1 Mar 2016 17:49:04 +0000 (17:49 +0000)]
Merge "AAPT2: Enable product/config filtering and improve source ordering" into nyc-dev
The Android Automerger [Tue, 1 Mar 2016 08:04:28 +0000 (00:04 -0800)]
"NRC61"
The Android Automerger [Tue, 1 Mar 2016 08:00:39 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
Stuart Scott [Fri, 19 Feb 2016 19:15:15 +0000 (11:15 -0800)]
Switch to CTSv2
bug:
21762834
Change-Id: If91fd4de148241760ff29cbe227864e301a9fca7
The Android Automerger [Mon, 29 Feb 2016 21:59:13 +0000 (13:59 -0800)]
"NRC60B"
Dan Willemsen [Wed, 10 Feb 2016 22:39:27 +0000 (14:39 -0800)]
Remove debug statement
(cherry picked from commit
dbf07922796a6df84221e482aefd05f82a95d9e7)
Change-Id: I769ed278012d3b77f6446c24787ea8d3fe29861a
Dan Willemsen [Tue, 9 Feb 2016 22:55:13 +0000 (14:55 -0800)]
Tell Soong about HOST_CROSS_*
This configures Soong to build windows binaries, which requires support
for 64-bit windows binaries in BUILD_PREBUILT for USE_SOONG=true.
module_arch_supported.mk did not support 64-bit being the secondary
architecture when evaluating multilib conditionals. All other uses of
HOST_*_IS_64_BIT already check the proper version.
(cherry picked from commit
d6e3b841850d9a607eb9c841d9fa1836feedee5f)
Change-Id: I99cb69ea1756b8258f15d3630c75c9ffe277aaef
Nick Kralevich [Sat, 27 Feb 2016 18:41:41 +0000 (10:41 -0800)]
delete recovery policy on changing build types
When the build type changes (for example, from "shamu-userdebug"
to "shamu-user"), the build system doesn't delete all files
and start over. Rather, build artifacts from the old build type
are reused for the new build type.
This is problematic for the recovery SELinux policy, which differs
between build types. Reusing a userdebug policy on a user build
is inappropriate and could lead to security bugs.
Force the deletion of the recovery SELinux policy when changing
build types, so it can be properly regenerated. This is consistent
with how we treat the normal SELinux policy (see commit
a8b3d54101eccb9950651103c199edf0ce2520f7).
(cherry picked from commit
3cb10bbd3b376aecbbefffbe4d43105665bad345)
Change-Id: I1d8ad7e06112777c66abed4546dadb85d35e33e1
The Android Automerger [Mon, 29 Feb 2016 08:01:12 +0000 (00:01 -0800)]
"NRC60"
The Android Automerger [Mon, 29 Feb 2016 08:00:12 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 28 Feb 2016 08:05:01 +0000 (00:05 -0800)]
"NRC59"
The Android Automerger [Sun, 28 Feb 2016 08:01:09 +0000 (00:01 -0800)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 28 Feb 2016 00:33:45 +0000 (16:33 -0800)]
"NRC56G"
Dimitry Ivanov [Sat, 27 Feb 2016 00:24:26 +0000 (16:24 -0800)]
Add options for dynamic linker developer warnings
Add bionic options that enable developer warnings for
beta/preview builds.
Bug: http://b/
27365747
Change-Id: Ifc2ab706975558824522da5eece186e1660969ad
Stephen Hines [Wed, 24 Feb 2016 05:58:06 +0000 (21:58 -0800)]
Update to use the latest clang-
2629532.
Bug: http://b/
25642296
(cherry picked from commit
352bccb65ec94a5cb48a31c5b3713b96b2edae9f)
Change-Id: I57bcbed0d7d51864ba7d7325334e9bbbba9f847b
Chih-Hung Hsieh [Tue, 2 Feb 2016 19:30:39 +0000 (11:30 -0800)]
Use newest clang static analyzers.
* When WITH_STATIC_ANALYZER is set and non-zero, and clang compiler is used,
call new clang ccc-analyzer or c++-analyzer.
* Otherwise, if WITH_SYNTAX_CHECK is set and non-zero,
call compiler with -fsyntax-only.
* Replace "--sysroot=path" with "--sysroot path", to work with ccc-analyzer.
* ccc-analyzer executes the original compilation command to generate
object files before calling clang with --analyze to do static analysis.
* When clang is called with --analyze, macro __clang_analyzer__ is defined.
BUG:
13287788
(cherry picked from commit
765c1ea6d7272fae04d435b9bac79087a2f6aabf)
Change-Id: I6e51e51ff4ed3ce514f60d090494dcdf6e520b04
Dan Willemsen [Sat, 6 Feb 2016 00:20:19 +0000 (16:20 -0800)]
Add 64-bit windows cross-compiles
This is mostly the same as the existing 2ND_HOST / HOST_CROSS support.
The interesting thing I did here was make x86 the 'first' architecture,
and x86_64 the second. This way LOCAL_MULTILIB := first defaults to
32-bit windows modules.
windows-x86/bin <- defaults to 32-bit executables
windows-x86/lib <- 32-bit libraries, like before
windows-x86/lib64 <- 64-bit libraries
windows-x86/obj <- 32-bit intermediates
windows-x86/obj64 <- 64-bit intermediates
Then modules are registered with the names:
host_cross_liblog <- 32-bit, like before
host_cross_liblog_64 <- 64-bit
Bug:
26957718
(cherry picked from commit
9ecbf832593980facba06c9031b8539b9cfdfd26)
Change-Id: Iab2d36e20d7002568c3534e7781e9ac8ab21a4a9
Adam Lesinski [Fri, 26 Feb 2016 19:13:43 +0000 (11:13 -0800)]
AAPT2: Enable product/config filtering and improve source ordering
- Restore old ordering of resource files to match AAPT behavior
- Change the order in which overlays are processed.
Change-Id: I9da88f6b4124e7f89a70eb485b4591d5c4c87d38
Tao Bao [Fri, 26 Feb 2016 03:49:55 +0000 (19:49 -0800)]
releasetools: Add --oem_no_mount option.
We may have devices with OEM-specific properties but without an OEM
partition (e.g. the properties might be set by init based on hardware
SKUs). For such devices, we supply --oem_no_mount to skip mounting the
OEM partition in the updater-script. The option is only meaningful when
-o (--oem_settings) is specified.
Bug:
27359929
Change-Id: Ic08396e478a82be4188e980e704b33b4f704a8d7
(cherry picked from commit
8608cde944d64dece63e8c770deb78c1d092c719)
Ying Wang [Fri, 26 Feb 2016 22:58:12 +0000 (22:58 +0000)]
Merge "AAPT2: library resource compilation" into nyc-dev
The Android Automerger [Fri, 26 Feb 2016 21:14:31 +0000 (13:14 -0800)]
"NRC56F"
Prathmesh Prabhu [Fri, 26 Feb 2016 19:17:20 +0000 (11:17 -0800)]
[Emulator] Add comment about including AOSP messaging on AOSP images.
We've gone back and forth on this a few times.
Just state clearly why we're including the AOSP messaging APP here.
BUG:
22097835
Change-Id: I26864ba033f0a211d038fa3526241c869d677217
Keun Soo Yim [Fri, 26 Feb 2016 19:24:09 +0000 (19:24 +0000)]
Merge "build file change for vts to use the existing cts-tradefed infrastructure" into nyc-dev
Ying Wang [Wed, 24 Feb 2016 22:11:55 +0000 (14:11 -0800)]
AAPT2: library resource compilation
- Switch to static library's package-res.apk as the link artifact.
- For prebuilt AAR file, build package-res.apk using aapt2's "--dir"
option.
- New LOCAL variables:
LOCAL_USE_AAPT2: a module can opt-in with "LOCAL_USE_AAPT2 := true".
LOCAL_STATIC_ANDROID_LIBRARIES: static Java libraries with compiled
resources.
LOCAL_SHARED_ANDROID_LIBRARIES: shared Java libraries with compiled
resources.
Bug:
25958912
Change-Id: I4be2d1e8137555986338c2583cb39b0c97391751
The Android Automerger [Fri, 26 Feb 2016 03:27:33 +0000 (19:27 -0800)]
"NRC56E"
Lorenzo Colitti [Thu, 25 Feb 2016 06:50:28 +0000 (15:50 +0900)]
Remove dhcpcd from the base target makefile.
Bug:
27192644
Change-Id: Iacac58e05c441dd267c7f09f91dbfcb94f54167c
Tao Bao [Tue, 23 Feb 2016 19:38:39 +0000 (11:38 -0800)]
releasetools: Support generating downgrade incremental OTAs.
Add --downgrade flag to ota_from_target_files.py script. It allows
generating an incremental OTA that updates from a newer build to an
older one (based on timestamp comparison). "post-timestamp" line in the
metadata file will be replaced by "ota-downgrade=yes". A data wipe will
always be enforced, so "ota-wipe=yes" will also be included in the
metadata file.
Bug:
26883782
Change-Id: Iaa05f662d948b7ab632a9fbb7051cc3f8bf68c21
(cherry picked from commit
5d1825664a0fec256fa28d62aadcac96f59a41b2)
The Android Automerger [Thu, 25 Feb 2016 22:28:25 +0000 (14:28 -0800)]
"NRC56D"
The Android Automerger [Thu, 25 Feb 2016 19:15:40 +0000 (11:15 -0800)]
"NRC56C"
The Android Automerger [Thu, 25 Feb 2016 15:34:38 +0000 (07:34 -0800)]
"NRC56B"
The Android Automerger [Thu, 25 Feb 2016 15:32:34 +0000 (07:32 -0800)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Thu, 25 Feb 2016 08:03:51 +0000 (00:03 -0800)]
"NRC56"
The Android Automerger [Thu, 25 Feb 2016 08:00:30 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
Keun Soo Yim [Wed, 24 Feb 2016 23:41:01 +0000 (15:41 -0800)]
build file change for vts to use the existing cts-tradefed infrastructure
Mostly done by stuartscott@
Change-Id: I016405757f39df833d532bc01fd2237e5e961a8a
Alex Light [Wed, 24 Feb 2016 23:34:06 +0000 (23:34 +0000)]
Merge "Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE" into nyc-dev
Alex Light [Wed, 24 Feb 2016 21:08:58 +0000 (13:08 -0800)]
Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE
(cherry picked from commit
bdfeb3e760feb080b449cc58129e5473bda54dec)
Bug:
27340895
Bug:
27324856
Change-Id: Id3994c6d334c8bb673fc3849550f591136a8dd6a
The Android Automerger [Wed, 24 Feb 2016 22:14:41 +0000 (14:14 -0800)]
"NRC55B"
Dan Willemsen [Wed, 24 Feb 2016 18:31:42 +0000 (18:31 +0000)]
Merge "Warn more clearly when there are duplicate copied headers" into nyc-dev
Neil Fuller [Wed, 24 Feb 2016 10:15:14 +0000 (10:15 +0000)]
Merge "Revert "Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8""" into nyc-dev
The Android Automerger [Wed, 24 Feb 2016 08:03:48 +0000 (00:03 -0800)]
"NRC55"
The Android Automerger [Wed, 24 Feb 2016 08:00:42 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
Ying Wang [Wed, 24 Feb 2016 05:49:25 +0000 (05:49 +0000)]
Allow to build against Mac OS X SDK 10.11. am:
7f7c698959 am:
773b017ee9 am:
e511a07677
am:
6a95943887
* commit '
6a95943887c1ad35bcd059119ac506741c172048':
Allow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 24 Feb 2016 05:49:13 +0000 (05:49 +0000)]
Update mac_sdk_versions_supported. am:
8df3355f64 am:
0954a9d91f am:
2114b48a14
am:
938722577b -s ours
* commit '
938722577bb7005dd321534ca29de2ccf71869e7':
Update mac_sdk_versions_supported.
Ying Wang [Wed, 24 Feb 2016 03:01:39 +0000 (03:01 +0000)]
Allow to build against Mac OS X SDK 10.11. am:
7f7c698959 am:
773b017ee9
am:
e511a07677
* commit '
e511a07677dfc8f622f5fa8863b453aad7ffcdea':
Allow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 24 Feb 2016 03:01:22 +0000 (03:01 +0000)]
Update mac_sdk_versions_supported. am:
8df3355f64 am:
0954a9d91f
am:
2114b48a14
* commit '
2114b48a14c6108d2d4d3207c2eb87d2d72ab76d':
Update mac_sdk_versions_supported.
Ying Wang [Wed, 24 Feb 2016 02:55:16 +0000 (02:55 +0000)]
Allow to build against Mac OS X SDK 10.11. am:
7f7c698959
am:
773b017ee9
* commit '
773b017ee96ace4e4bdc176dd59fc14c979736ef':
Allow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 24 Feb 2016 02:54:51 +0000 (02:54 +0000)]
Update mac_sdk_versions_supported. am:
8df3355f64
am:
0954a9d91f
* commit '
0954a9d91f8f68133150a39afc364e1ad091a19b':
Update mac_sdk_versions_supported.
Ying Wang [Wed, 24 Feb 2016 02:46:46 +0000 (02:46 +0000)]
Allow to build against Mac OS X SDK 10.11.
am:
7f7c698959
* commit '
7f7c6989590bd9395e8ebf3a01b5b4033c89d7d1':
Allow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 24 Feb 2016 02:46:36 +0000 (02:46 +0000)]
Update mac_sdk_versions_supported.
am:
8df3355f64
* commit '
8df3355f64119adb9ca71c9f2cc9b51afb61c65a':
Update mac_sdk_versions_supported.
Ying Wang [Wed, 14 Oct 2015 01:00:45 +0000 (18:00 -0700)]
Allow to build against Mac OS X SDK 10.11.
Bug:
24739158
Change-Id: I7c57e141dd02a0d2de5a7a1ccbc72ffe422a8d6f
Ying Wang [Wed, 29 Jul 2015 23:35:40 +0000 (16:35 -0700)]
Update mac_sdk_versions_supported.
Now we requires Mac OS X SDK version at least 10.8.
Also removed the unnecessary sort call in getting
mac_sdk_versions_installed.
Lexical sort doesn't make sense when 10.10 is added to that list.
Actually the next makefile line makes sure we always get the first
match in $(mac_sdk_versions_supported):
mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed),
$(mac_sdk_versions_supported)))
Bug:
22825165
Change-Id: I4bfafabb11f94b66704d4799fe61fe3f16429538
bohu [Wed, 24 Feb 2016 00:28:26 +0000 (16:28 -0800)]
Emulator: Add fingerprint permission to sdk system images
Since N, the android.hardware.fingerprint.xml is required.
bug:
27324642
Change-Id: Ib2f77f68bb4b9a68e1e77311fae3ce2a30bc37cb
Dan Willemsen [Tue, 23 Feb 2016 21:40:07 +0000 (13:40 -0800)]
Warn more clearly when there are duplicate copied headers
When more than one makefile tries to copy a header to the same
destination, the warning is not clear, and hard to track down and assign
blame:
build/core/copy_headers.mk:15: warning: ignoring old commands for target `out/target/product/bullhead/obj/include/qcom/display/copybit.h'
With this change, the same behavior is kept, but the warning message is
more descriptive, and contains the offending Android.mk files:
build/core/Makefile:54: Duplicate header copy: out/target/product/bullhead/obj/include/qcom/display/copybit.h
build/core/Makefile:54: Defined in: hardware/qcom/display/msm8994/libcopybit/Android.mk hardware/qcom/display/msm8994/libcopybit/Android.mk
In this case, a $(CLEAR_VARS) is missing, so the same Android.mk file is
copying the same headers twice.
Bug:
27302058
Change-Id: Icf8f580ae71a78741db21c1d8f3213424459e637
(cherry picked from commit
6f60f020d781d9a93786616039323e9f25e02c0b)
Bo Hu [Tue, 23 Feb 2016 21:46:31 +0000 (21:46 +0000)]
Merge "emulator: allows surfaceflinger to change qemu.gles value" into nyc-dev
The Android Automerger [Tue, 23 Feb 2016 21:07:51 +0000 (13:07 -0800)]
"NRC54B"
Prathmesh Prabhu [Tue, 23 Feb 2016 20:32:28 +0000 (12:32 -0800)]
Generic x86_64: Bump system image partition size to 1.75 GB.
BUG=b.android.com/201662
Change-Id: I3b13082d73a3e1c9f49cb9158d2423dc580a8c75
Ying Wang [Mon, 22 Feb 2016 23:54:27 +0000 (15:54 -0800)]
Make sure my_src_jar is set up properly for host prebuilt jar
Make sure my_src_jar is set up properly for host prebuilt jar when we
need to generate host .jack for host dalvik java libraries.
(cherry picked from commit
86e74b96fcc46d6d6c3758b13cca755c12e7de8a)
Change-Id: I79393bc416fafb6d9cd28b12070a58ae5731587d
Neil Fuller [Tue, 23 Feb 2016 11:17:32 +0000 (11:17 +0000)]
Revert "Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8""
This reverts commit
799d603029701fd565538ed7d09be3cdf34dded9.
Neil Fuller [Tue, 23 Feb 2016 10:24:39 +0000 (10:24 +0000)]
Merge "Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8"" into nyc-dev
Neil Fuller [Tue, 23 Feb 2016 10:18:42 +0000 (10:18 +0000)]
Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8"
Reverting: broke the messaging app due to a recent change
there (commit
280a2fbe41f24eed11fcf5e13b803de17525b261).
This reverts commit
dfcd9124880528a7bfbf9ba361b1a2040035ca06.
Change-Id: I055f35c0a7400ab2887c91d017eebaed1adaf972
Neil Fuller [Tue, 23 Feb 2016 09:47:35 +0000 (09:47 +0000)]
Merge "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8" into nyc-dev
The Android Automerger [Tue, 23 Feb 2016 08:04:26 +0000 (00:04 -0800)]
"NRC54"
The Android Automerger [Tue, 23 Feb 2016 08:00:36 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Tue, 23 Feb 2016 00:25:13 +0000 (16:25 -0800)]
"NRC53C"
The Android Automerger [Mon, 22 Feb 2016 22:18:57 +0000 (14:18 -0800)]
"NRC53B"
Sami Tolvanen [Wed, 10 Feb 2016 18:41:26 +0000 (10:41 -0800)]
Clear logd intermediates
Needed by changes from
Idcdc5bff133f13c1267f0ec0a75cc8cf1ddbda0d
Bug:
26902605
Change-Id: Id3ca7889ede30b54b7af73dd50653ca1a20d59aa
(cherry picked from commit
d7da0ffb20a421a5c9c90084b30e8f665d165f5b)
Yohann Roussel [Mon, 22 Feb 2016 13:04:51 +0000 (13:04 +0000)]
Merge "Add support for testing obfuscated app with Jack" into nyc-dev
Calin Juravle [Mon, 22 Feb 2016 11:41:59 +0000 (11:41 +0000)]
Merge "Add profman to the build scripts" into nyc-dev
Yohann Roussel [Tue, 3 Nov 2015 17:33:21 +0000 (18:33 +0100)]
Add support for testing obfuscated app with Jack
Bug:
17481317
Bug:
27215871
Bug:
27215868
(cherry picked from commit
505dafb03bdbd9351b5eb8565ac4d8195592ff9a)
Change-Id: Ia12fb92585cfcc595eef6cd096d27e779e596f7d
The Android Automerger [Mon, 22 Feb 2016 08:01:19 +0000 (00:01 -0800)]
"NRC53"
The Android Automerger [Mon, 22 Feb 2016 08:00:10 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 21 Feb 2016 08:04:11 +0000 (00:04 -0800)]
"NRC52"
The Android Automerger [Sun, 21 Feb 2016 08:00:30 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
bohu [Sat, 20 Feb 2016 01:20:32 +0000 (17:20 -0800)]
emulator: allows surfaceflinger to change qemu.gles value
This is to allow surfaceflinger to always load vendor provided
egl libraries first and fall back to software renderer, and then
set the qemu.gles to correct value reflecting what libraries
are actually used.
bug:
27273457
Change-Id: Ifaca31aa2e562f50baa41fd228df9836bc3b1667
Prathmesh Prabhu [Sat, 20 Feb 2016 01:02:03 +0000 (01:02 +0000)]
Merge "Allow smooth upgrade of AVD's from older API's." into nyc-dev
Lingfeng Yang [Fri, 5 Feb 2016 18:40:21 +0000 (10:40 -0800)]
Allow smooth upgrade of AVD's from older API's.
If we are using an old API for the emulator
(API 19 for example) and then upgrade the AVD
to API 23 through the AVD settings, we get a bunch
of crashes in the TelephonyProvider,
as it is looking for a file that does not exist
that concerns upgrading from old "apn"'s.
This CL adds this file to the files to be copied
to /etc in the system image.
BUG: b.android.com/200390
BUG=
27273457
RELEASE NOTE: Fixed telephony service crashes on startup when upgrading from an old API.
Change-Id: I227713880bf20541c759aab588c00197ac7aebfd
(cherry picked from commit
e5083159401edf1df5109b56d1aedbbb739584e6)
The Android Automerger [Fri, 19 Feb 2016 23:46:58 +0000 (15:46 -0800)]
"NRC50"
The Android Automerger [Fri, 19 Feb 2016 23:43:11 +0000 (15:43 -0800)]
merge in nyc-release history after reset to nyc-dev
Bjoern Johansson [Wed, 18 Nov 2015 18:04:21 +0000 (10:04 -0800)]
Explicitly use messaging app in SDK phone builds
This change explicitly includes only the messaging app instead of all of
aosp_base_telephony. This fixes the issue where on initial boot the user
was prompted to select a Home app. This happened because the
aosp_base_telephony makefile includes other makefiles that in turn add
the package Provision which has an activity with an intent filter for
handling HOME. SdkSetup already had such an activity so with two choices
it was left to the user to decide which one to use.
BUG=
27273457
Change-Id: I42e77b892ce235a5fa858561325ae37973cfb0cd
(cherry picked from commit
12de252f451b34cfa67f7256027dad84dcfd984d)
Zach Jang [Fri, 19 Feb 2016 22:34:03 +0000 (22:34 +0000)]
Updating security string patch to 2016-04-01 am:
e182d2a95c am:
054bbb9766 am:
7e6a1633c8 am:
eb651e2e45 am:
3f53b385de am:
fc30358acb
am:
c4d9b64a68
* commit '
c4d9b64a686dbfbc8e2f91d96203a7328249f5dd':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 22:28:35 +0000 (22:28 +0000)]
Updating security string patch to 2016-04-01 am:
e182d2a95c am:
054bbb9766 am:
7e6a1633c8 am:
eb651e2e45 am:
3f53b385de
am:
fc30358acb
* commit '
fc30358acbfaa41e2c3282832ceb3607a0c2fcb9':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 22:22:57 +0000 (22:22 +0000)]
Updating security string patch to 2016-04-01 am:
e182d2a95c am:
054bbb9766 am:
7e6a1633c8 am:
eb651e2e45
am:
3f53b385de
* commit '
3f53b385dec6b45d0e4d07a29ce43b3c510b1d10':
Updating security string patch to 2016-04-01