OSDN Git Service
Adam Lesinski [Thu, 9 Oct 2014 13:02:13 +0000 (13:02 +0000)]
am
811e650b: Merge "Add appops command to devices" into lmp-dev
* commit '
811e650b820ffa4f291d18d6f49673314848c810':
Add appops command to devices
Narayan Kamath [Thu, 9 Oct 2014 12:58:05 +0000 (13:58 +0100)]
resolved conflicts for merge of
1a856098 to lmp-mr1-dev
Change-Id: Id2ef023078a251cc58450d457f5b20261e2851a3
Paul Lawrence [Wed, 8 Oct 2014 22:05:21 +0000 (15:05 -0700)]
fs_mgr is now different on different build types
This is to enable compile time selection of disable-verity behavior
See https://googleplex-android-review.git.corp.google.com/#/c/563402/
Bug:
17691572
Change-Id: I6d77e39f070f2a753e09e5634cc3d9ebfceccada
Adam Lesinski [Wed, 8 Oct 2014 18:03:14 +0000 (18:03 +0000)]
Merge "Add appops command to devices" into lmp-dev
Adam Lesinski [Wed, 8 Oct 2014 17:53:59 +0000 (10:53 -0700)]
Add appops command to devices
This is used to set appops permissions from the command line
or from CTS tests via the shell.
Change-Id: I8a71d1398e2071aecfd22be7b6530f186f40c2c0
Ying Wang [Wed, 8 Oct 2014 16:33:16 +0000 (16:33 +0000)]
Merge "Export build thumbprint only if the product has specified at least one oem fingerprint property" into lmp-dev
Vince Harron [Wed, 8 Oct 2014 05:19:12 +0000 (05:19 +0000)]
am
3e8b79c2: Merge "Increase system image partition size to fix build" into lmp-dev
* commit '
3e8b79c2b3c84b2c6ef7b28903a719b10248e63d':
Increase system image partition size to fix build
smain@google.com [Wed, 8 Oct 2014 05:19:11 +0000 (05:19 +0000)]
am
783d016a: am
bc667f1c: am
08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
* commit '
783d016a27ea342ad6445720026a14e89ae1c78c':
fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
smain@google.com [Wed, 8 Oct 2014 05:19:10 +0000 (05:19 +0000)]
am
4247c940: am
f4cefc19: am
633f322b: update the analytics tracking event calls to use new API for analytics.js bug:
16331906
* commit '
4247c940d45318f5553138fd37f13f85f2854c6a':
update the analytics tracking event calls to use new API for analytics.js bug:
16331906
Ying Wang [Wed, 8 Oct 2014 01:42:11 +0000 (18:42 -0700)]
Export build thumbprint only if the product has specified at least one oem fingerprint property
Bug:
17888863
Change-Id: I4d12bc977dcb5e8e1858efb2a395466d8779de34
Vince Harron [Tue, 7 Oct 2014 23:19:35 +0000 (23:19 +0000)]
Merge "Increase system image partition size to fix build" into lmp-dev
Vince Harron [Tue, 7 Oct 2014 22:54:19 +0000 (15:54 -0700)]
Increase system image partition size to fix build
Build of sdk_google_phone_x86_64-sdk_addon product was failing with
the following error message:
error: ext4_allocate_best_fit_partial: failed to allocate 2420 blocks,
out of space?
Change-Id: Ib9e2d21bac86b12b6f8f75d4f30806dd20abcb90
smain@google.com [Tue, 7 Oct 2014 22:23:35 +0000 (22:23 +0000)]
am
bc667f1c: am
08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
* commit '
bc667f1cd7d852909a9a3893473f29dc7b000b2f':
fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
smain@google.com [Tue, 7 Oct 2014 22:23:19 +0000 (22:23 +0000)]
am
f4cefc19: am
633f322b: update the analytics tracking event calls to use new API for analytics.js bug:
16331906
* commit '
f4cefc19e87eae62b6f2f8cc40b154f9fbe4b3de':
update the analytics tracking event calls to use new API for analytics.js bug:
16331906
Christopher Ferris [Sun, 5 Oct 2014 19:27:10 +0000 (19:27 +0000)]
am
397a8be4: Merge "Call art-on only when debugging ART processes." into lmp-dev
* commit '
397a8be4bc26a696cf205ac9800865caee3ecf61':
Call art-on only when debugging ART processes.
Christopher Ferris [Sun, 5 Oct 2014 19:19:56 +0000 (19:19 +0000)]
Merge "Call art-on only when debugging ART processes." into lmp-dev
Christopher Ferris [Sat, 4 Oct 2014 00:29:27 +0000 (17:29 -0700)]
Call art-on only when debugging ART processes.
If you are debugging a native process, SIGSEGV gets ignored by default.
Make it so that the special ART gdb macro is only called when debugging
app_processXX.
Bug:
17815162
Change-Id: Idba86860dfd94e7483f2668beeb76b3e6032fb34
smain@google.com [Sat, 4 Oct 2014 00:46:20 +0000 (00:46 +0000)]
am
08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
* commit '
08f336eaffa09581f2c33aee99847ee4edbeb370':
fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
smain@google.com [Sat, 4 Oct 2014 00:40:00 +0000 (17:40 -0700)]
fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c
that causes anchors in most docs other than reference to stop working
Change-Id: I58ed0f7a84c4478d482d63e675693a197088019a
smain@google.com [Fri, 3 Oct 2014 23:57:14 +0000 (23:57 +0000)]
am
633f322b: update the analytics tracking event calls to use new API for analytics.js bug:
16331906
* commit '
633f322b38c9a16aa0cac78a1f2a3fb6b1cacf86':
update the analytics tracking event calls to use new API for analytics.js bug:
16331906
Andreas Gampe [Fri, 3 Oct 2014 23:52:41 +0000 (23:52 +0000)]
am
c776f063: Merge "Build: Do not set interpreted mode for SDK build" into lmp-dev
* commit '
c776f06379929f1e1b9d1f4bb0749faf36e19670':
Build: Do not set interpreted mode for SDK build
smain@google.com [Fri, 3 Oct 2014 22:49:45 +0000 (15:49 -0700)]
update the analytics tracking event calls to use new API for analytics.js
bug:
16331906
Change-Id: I015b5aae825525822ca767d293b473f9f332961a
Andreas Gampe [Fri, 3 Oct 2014 22:20:54 +0000 (22:20 +0000)]
Merge "Build: Do not set interpreted mode for SDK build" into lmp-dev
smain@google.com [Fri, 3 Oct 2014 21:32:19 +0000 (21:32 +0000)]
am
c464dbc3: am
5e5f5b77: am
7ddf7943: am
9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a>
* commit '
c464dbc3b673010720e66d6a299dadb1dfaadab6':
more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug:
16924057
Ying Wang [Fri, 3 Oct 2014 21:32:19 +0000 (21:32 +0000)]
am
a45c2e58: Merge "Add two useful character constants." into lmp-dev
* commit '
a45c2e5834ae6ff983e158c79f4fd65e09cdb766':
Add two useful character constants.
Andreas Gampe [Fri, 3 Oct 2014 20:36:51 +0000 (13:36 -0700)]
Build: Do not set interpreted mode for SDK build
In case of emulator images created for an sdk build (sdk, win_sdk,
sdk_addon), do not set dex2oat to compile apps interpret-only.
Bug:
17796919
Change-Id: I6961aa20fd3b6ea164a1f55321387e84c8983550
smain@google.com [Fri, 3 Oct 2014 19:03:43 +0000 (19:03 +0000)]
am
5e5f5b77: am
7ddf7943: am
9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as ancho
* commit '
5e5f5b777414204cf600727662ac0f89de6f8211':
more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug:
16924057
smain@google.com [Fri, 3 Oct 2014 18:59:17 +0000 (18:59 +0000)]
am
7ddf7943: am
9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all AP
* commit '
7ddf794392d6e79fed66039fd9a59d37d12dbcd3':
more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug:
16924057
smain@google.com [Fri, 3 Oct 2014 18:54:36 +0000 (18:54 +0000)]
am
9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bu
* commit '
9a818f55f4a4ca4f88c2a29f8e77ea6cb2153de6':
more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug:
16924057
Ying Wang [Fri, 3 Oct 2014 18:47:16 +0000 (18:47 +0000)]
Merge "Add two useful character constants." into lmp-dev
Ying Wang [Fri, 3 Oct 2014 18:36:27 +0000 (11:36 -0700)]
Add two useful character constants.
You need those constant variables when you want to insert newline or
backslash at the end of a macro.
Change-Id: I3fe96580d7a4ebc9d013afe6dd4ec8f40f49c724
smain@google.com [Fri, 3 Oct 2014 16:25:59 +0000 (09:25 -0700)]
more fixes to scroll offset for the sticky header.
This offsets the layout position of all <a name=""> tags so they naturally
show up below the sticky nav bar... though this is only for API reference,
which uses <a> tags as anchors for all API members.
bug:
16924057
Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c
Ying Wang [Fri, 3 Oct 2014 17:25:04 +0000 (17:25 +0000)]
am
4991ae0b: Merge "Add split apks to the cts package." into lmp-dev
* commit '
4991ae0b461688a5ecfe43707b9034e4e56809e4':
Add split apks to the cts package.
Ying Wang [Fri, 3 Oct 2014 17:15:34 +0000 (17:15 +0000)]
Merge "Add split apks to the cts package." into lmp-dev
Andreas Gampe [Fri, 3 Oct 2014 17:06:03 +0000 (17:06 +0000)]
am
a815a009: Merge "Build: Increase system image for generic_arm64" into lmp-dev
* commit '
a815a009844586b01f525bc1e68335d6af078727':
Build: Increase system image for generic_arm64
Andreas Gampe [Fri, 3 Oct 2014 16:54:58 +0000 (16:54 +0000)]
Merge "Build: Increase system image for generic_arm64" into lmp-dev
Andreas Gampe [Fri, 3 Oct 2014 09:37:45 +0000 (02:37 -0700)]
Build: Increase system image for generic_arm64
Prebuilts are now preopted. This requires a bump in system image
size. Technically a 13M bump would have been fine, but round up
to 50M for a little bit of future breathing space.
Bug:
17772057
Change-Id: Ib10dc24960c0b2e03ef28c55c3c199382802d4e1
Andreas Gampe [Thu, 2 Oct 2014 21:24:58 +0000 (21:24 +0000)]
am
5e0dbe0c: Conditionally skip dex-preopting prebuilts.
* commit '
5e0dbe0c3769031b4785ef54a89554cd5c75cba7':
Conditionally skip dex-preopting prebuilts.
Andreas Gampe [Thu, 2 Oct 2014 05:01:16 +0000 (22:01 -0700)]
Conditionally skip dex-preopting prebuilts.
To skip dex-preopting prebuilts (to save system image space),
set "DONT_DEXPREOPT_PREBUILTS := true".
Bug:
17772057
Change-Id: I13f10e2a9c251366f29606158f8c2fb54f8ee8b1
Justin Koh [Thu, 2 Oct 2014 16:57:00 +0000 (16:57 +0000)]
am
bc904d2f: am
626f62b3: (-s ours) am
cef526f0: DO NOT MERGE Update version code for MR1 (4.4W.2)
* commit '
bc904d2f66c457c781cea47bec32c588d97ce870':
DO NOT MERGE Update version code for MR1 (4.4W.2)
Justin Koh [Thu, 2 Oct 2014 16:45:23 +0000 (16:45 +0000)]
am
626f62b3: (-s ours) am
cef526f0: DO NOT MERGE Update version code for MR1 (4.4W.2)
* commit '
626f62b34178d4ef6340a0e8a0f6d56d05181939':
DO NOT MERGE Update version code for MR1 (4.4W.2)
Justin Koh [Thu, 2 Oct 2014 16:41:53 +0000 (16:41 +0000)]
am
cef526f0: DO NOT MERGE Update version code for MR1 (4.4W.2)
* commit '
cef526f0f48340256a79999cb2ddbc1c86933141':
DO NOT MERGE Update version code for MR1 (4.4W.2)
Stephen Hines [Thu, 2 Oct 2014 15:28:38 +0000 (15:28 +0000)]
am
a503fb36: PIE executables created with mingw use "mainCRTStartup" as their entry point.
* commit '
a503fb362918363b28637b487eba83e9ad647ceb':
PIE executables created with mingw use "mainCRTStartup" as their entry point.
Stephen Hines [Thu, 2 Oct 2014 07:51:11 +0000 (00:51 -0700)]
PIE executables created with mingw use "mainCRTStartup" as their entry point.
Bug:
14416410
Our linker uses "start" as the primary entry point, so we need to adjust this
for mingw-based Windows compiles, or nothing will execute correctly.
Change-Id: I6e99f43e075ef9f00500099ce34ec4425c996454
Ying Wang [Thu, 2 Oct 2014 01:44:52 +0000 (01:44 +0000)]
am
72f0cf56: Merge "Convert comma in split arguments to underscore." into lmp-dev
* commit '
72f0cf56b362b8a4b6cfefb3f47240aa9e2d5ce6':
Convert comma in split arguments to underscore.
Ying Wang [Thu, 2 Oct 2014 01:00:03 +0000 (01:00 +0000)]
Merge "Convert comma in split arguments to underscore." into lmp-dev
Tim Murray [Wed, 1 Oct 2014 23:49:47 +0000 (23:49 +0000)]
am
1de16912: Merge "Update prebuilt RS clcore location." into lmp-dev
* commit '
1de169124df75618026b0264dbf782f336291f32':
Update prebuilt RS clcore location.
Tim Murray [Wed, 1 Oct 2014 23:31:49 +0000 (23:31 +0000)]
Merge "Update prebuilt RS clcore location." into lmp-dev
Stephen Hines [Wed, 1 Oct 2014 23:05:33 +0000 (23:05 +0000)]
am
07a11d31: Merge "Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler." into lmp-dev
* commit '
07a11d31f0baa355f9c3da60f965a56ff1d125e5':
Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
Stephen Hines [Wed, 1 Oct 2014 23:05:32 +0000 (23:05 +0000)]
am
56f688bc: Merge "Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_"." into lmp-dev
* commit '
56f688bce5f3229f065a94446d049bc3a055b92b':
Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_".
Stephen Hines [Wed, 1 Oct 2014 22:54:09 +0000 (22:54 +0000)]
Merge "Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler." into lmp-dev
Stephen Hines [Wed, 1 Oct 2014 22:53:38 +0000 (22:53 +0000)]
Merge "Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_"." into lmp-dev
Tim Murray [Tue, 30 Sep 2014 22:08:03 +0000 (15:08 -0700)]
Update prebuilt RS clcore location.
Change-Id: Iebf255d7cc093b74e08b1f1378d9b397fd9dd3b9
Dehao Chen [Fri, 19 Sep 2014 17:18:12 +0000 (10:18 -0700)]
Add global option filtering for FDO builds.
Change-Id: I95e797f7f5945bb34061d17e49156ca8c8a19854
(cherry picked from commit
c7ed00fc00145ce0204f205f6ab89d3bbe216040)
Ying Wang [Wed, 1 Oct 2014 19:01:04 +0000 (12:01 -0700)]
Convert comma in split arguments to underscore.
aapt already does so.
Bug:
16947729
Change-Id: I813fb8cf41b3ec836e6e6d5f68af12dc385169f8
Ying Wang [Wed, 1 Oct 2014 18:46:30 +0000 (11:46 -0700)]
Add split apks to the cts package.
With split apk support, we may have multilple installed files for a
module. Use ALL_MODULES.$(module).BUILT_INSTALLED to make sure get
every split apk included.
Bug:
16947729
Change-Id: I4e41c2586f1b25f4810b67cd1e948aba0cbcf97b
Justin Koh [Wed, 1 Oct 2014 18:24:57 +0000 (11:24 -0700)]
DO NOT MERGE Update version code for MR1 (4.4W.2)
Change-Id: Ib87f27166f773d8e880e7ffcded8e8b739989b7c
Ying Wang [Wed, 1 Oct 2014 15:16:46 +0000 (15:16 +0000)]
am
fc6d5b6a: Allow to add jar resource or manifest even without Java code.
* commit '
fc6d5b6a947fa80061778639290c0241b93635b4':
Allow to add jar resource or manifest even without Java code.
Ying Wang [Wed, 1 Oct 2014 15:16:46 +0000 (15:16 +0000)]
am
c168b6e2: Merge "the recovery image also needs to be signed with " into lmp-dev
* commit '
c168b6e27aa48c1d5552ed9143eeb00d2c9860a5':
the recovery image also needs to be signed with $(BOOT_SIGNER)
Chet Haase [Wed, 1 Oct 2014 15:16:45 +0000 (15:16 +0000)]
am
f388993a: Add docs for Palette and CardView
* commit '
f388993a8f5690cef3ea65f6982e343c53e96941':
Add docs for Palette and CardView
Ying Wang [Wed, 1 Oct 2014 00:32:58 +0000 (17:32 -0700)]
Allow to add jar resource or manifest even without Java code.
Change-Id: I2d8fd93f004d9e0c29c71b887810b2624769789e
Ying Wang [Tue, 30 Sep 2014 16:41:08 +0000 (16:41 +0000)]
Merge "the recovery image also needs to be signed with $(BOOT_SIGNER)" into lmp-dev
Stephen Hines [Tue, 30 Sep 2014 09:38:41 +0000 (02:38 -0700)]
Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
Bug:
14416410
prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32
is the location for the checked-in hermetic mingw Windows compiler. This
removes our reliance on host mingw when building with "make win_sdk".
Change-Id: I1f9bbb85912d9855be32f9cab4bdfd12d6d3246c
Stephen Hines [Tue, 30 Sep 2014 09:37:20 +0000 (02:37 -0700)]
Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_".
Bug:
14416410
Change-Id: Ife2d7329795f229adcddc5c57b20aa96c56387c0
Andrew Boie [Wed, 20 Aug 2014 21:43:06 +0000 (14:43 -0700)]
the recovery image also needs to be signed with $(BOOT_SIGNER)
Change-Id: Ie90976afdaada6410b1566fe497ce86ee935ad41
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Reviewed-on: https://android.intel.com/232319
Chet Haase [Sun, 28 Sep 2014 16:08:40 +0000 (09:08 -0700)]
Add docs for Palette and CardView
These new v7 support lib APIs were never added to the make files to
allow docs to be build, so they don't appear in the reference docs.
Adding them to pathmap.mk fixes this.
Issue #
17681531 Add docs for CardView and Palette
Change-Id: If9a4562c5e9629dc29791185dd720c6986c2b9a8
Dirk Dougherty [Sat, 27 Sep 2014 06:04:51 +0000 (06:04 +0000)]
am
fa5fb510: am
6f1efb31: am
11451e2e: am
83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit '
fa5fb51030043b286e2c14afe9fc024e3b3a09eb':
Doc change: increment queryparam to trigger cache flush on proxies.
Dirk Dougherty [Sat, 27 Sep 2014 05:25:08 +0000 (05:25 +0000)]
am
6f1efb31: am
11451e2e: am
83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit '
6f1efb310be5f66f05a0ac40f4af92d4770a7598':
Doc change: increment queryparam to trigger cache flush on proxies.
Dirk Dougherty [Sat, 27 Sep 2014 05:20:41 +0000 (05:20 +0000)]
am
11451e2e: am
83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit '
11451e2ec160b0405528b2ba6c13b40b15df8ed1':
Doc change: increment queryparam to trigger cache flush on proxies.
Dirk Dougherty [Sat, 27 Sep 2014 05:14:16 +0000 (05:14 +0000)]
am
83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit '
83fadade5bbc43914059405c1e49dd112e66d28d':
Doc change: increment queryparam to trigger cache flush on proxies.
Dirk Dougherty [Fri, 26 Sep 2014 22:00:55 +0000 (15:00 -0700)]
Doc change: increment queryparam to trigger cache flush on proxies.
Change-Id: I0ffbcc48761e697340e0c4a721893b33a085a137
Ying Wang [Fri, 26 Sep 2014 19:53:25 +0000 (19:53 +0000)]
am
a6a6c35c: Return "none" if no matching arch found
* commit '
a6a6c35c3afdf9c4bcd05ea5e4c40983e7e49246':
Return "none" if no matching arch found
Ying Wang [Fri, 26 Sep 2014 17:41:27 +0000 (10:41 -0700)]
Return "none" if no matching arch found
So result of get-prebuilt-src-arch can be passed to
LOCAL_MODULE_TARGET_ARCH, which takes empty string as "any" actually.
Change-Id: I916c9738ccce4a94ac084fb4141d54659e896a1f
Doug Zongker [Mon, 8 Sep 2014 23:02:02 +0000 (16:02 -0700)]
store supported versions of blockimgdiff in misc_info
Change-Id: Ibe14307aa49ffa75c9d69fb7bbdcb306780d74b4
Doug Zongker [Tue, 9 Sep 2014 19:38:47 +0000 (12:38 -0700)]
fix transfer list for full OTAs
The erase command we insert at the top for full OTAs was getting
inserted in the wrong place for version 2.
Change-Id: I9caf03a40efbdba79f3428f73e50d4319d9ba371
Doug Zongker [Tue, 9 Sep 2014 17:55:36 +0000 (10:55 -0700)]
add unit tests for rangelib
Change-Id: I3b77e849007259e697da56bd493ae5b553b901d1
Doug Zongker [Mon, 8 Sep 2014 15:29:55 +0000 (08:29 -0700)]
generate version 2 blockimgdiff files
Generate version 2 of the block_image_update transfer list format.
This improves patch size by a different strategy for dealing with
out-of-order transfers. If transfer A must be done before transfer B
due to B overwriting A's source but we want to do B before A, we
resolve the conflict by:
- before B is executed, we save ("stash") the overlapping region (ie
the blocks B will overwrite that A wants to read)
- when A is executed, it will read those parts of source data from
the stash rather than from the image.
This reverses the ordering constraint; with these additions now B
*must* go before A. The implementation of the stash is left up to the
code that executes the transfer list to apply the patch; it could hold
stashed data in RAM or on a scratch disk such as /cache, if available.
The code retains the ability to build a version 1 block image patch;
it's needed for processing older target-files.
Change-Id: Ia9aa0bd45d5dc3ef7c5835e483b1b2ead10135fe
Brett Chabot [Thu, 25 Sep 2014 21:09:41 +0000 (21:09 +0000)]
Merge "Remove cts dependency on ddmlib" into lmp-dev
Brett Chabot [Thu, 25 Sep 2014 19:38:36 +0000 (12:38 -0700)]
Remove cts dependency on ddmlib
Its now included in tradefed-prebuilt.
Bug:
17649015
Change-Id: I058bed467fb739a311b0645b7da6a6b72497c290
Jeff Arneson [Thu, 25 Sep 2014 03:45:49 +0000 (03:45 +0000)]
Merge "Refactor show_annotations_list to remove HTML tags from method params" into lmp-dev
Dianne Hackborn [Thu, 25 Sep 2014 00:28:32 +0000 (00:28 +0000)]
Merge "And then L, without ever becoming a real code name, transforms like magic to 5.0." into lmp-dev
Ying Wang [Wed, 24 Sep 2014 04:50:12 +0000 (21:50 -0700)]
Break package-modules build recipe to mutliple lines
To fix "Argument list too long" error seen on some machines.
Change-Id: I6f34668e938412751e257b4b543358e1fc0809a1
Dianne Hackborn [Mon, 22 Sep 2014 22:55:23 +0000 (15:55 -0700)]
And then L, without ever becoming a real code name, transforms like magic to 5.0.
The code name looked at 5.0 despondently. "Won't anyone care about
me? Why does everyone pretend like I don't even exist!" And it
was true -- for all of its life, nobody had ever whispered L's
true name, at least not in the same breath as many other names that
were not L's at all.
But 5.0 knew better. "L," the number said, "don't you fear. Some
day, I am sure, your name will go up in lights. Your name will shine
brighter than even my own. And everyone who is anyone will know
your name, write pages and pages all about your name, and debate
endlessly about everything you are."
L could only hope this would be true. But not today. Today, L
is still nobody.
Change-Id: I2523dd34ff7486badf8c9cd40e43833a5ef448b8
Ying Wang [Tue, 29 Jul 2014 17:34:30 +0000 (10:34 -0700)]
Allow LOCAL_ASSET_DIR point to nonexistent dir
LOCAL_ASSET_DIR may point to a dir generated during the build process.
We have done similiar things to LOCAL_RESOURCE_DIR.
(cherry picked from commit
bfcdf060bab129581acff32eb70896f719162bc9)
Bug:
16563899
Change-Id: Iaa72196e1e6350ae0720f8a4e0abc68d8d7ed642
Bill Yi [Fri, 19 Sep 2014 23:04:17 +0000 (16:04 -0700)]
Remove PinyinIME from target config
BUG:
17578207
Michael Runge [Fri, 19 Sep 2014 04:22:36 +0000 (04:22 +0000)]
Merge "If oem_fingerprint_props is empty, ignore." into lmp-dev
Michael Runge [Thu, 18 Sep 2014 22:12:45 +0000 (15:12 -0700)]
If oem_fingerprint_props is empty, ignore.
There may be cases where there is an OEM partition
but it has no effect on the OTA itself. In these
cases, ignore an empty value from the misc_info.txt
Change-Id: I5f467e873030765af12810a07ddd5f302ca8cc0b
Vineeta Srivastava [Thu, 18 Sep 2014 21:34:00 +0000 (14:34 -0700)]
Set oem_fingerprint_properties only when it is not empty.
Add oem_fingerprint_properties to misc_info.txt only when it is not empty.
Shamu does not have OEM specific OTA config and oem_fingerprint_properties
does not need to be set in misc_info.txt.
For sprout, it stays the same.
Bug:
16635599
Change-Id: I7e6c6f5ce1f94f8f1b6da0c2f56bc67ff9fc0f1c
David 'Digit' Turner [Tue, 16 Sep 2014 19:33:36 +0000 (19:33 +0000)]
Merge "envsetup.sh: Fix handling of emulator prebuilts path." into lmp-dev
David 'Digit' Turner [Tue, 16 Sep 2014 19:23:12 +0000 (21:23 +0200)]
envsetup.sh: Fix handling of emulator prebuilts path.
Due to a bad previous merge, everytime 'lunch' is called, a new
instance of prebuilts/android-emulator/<system>/ will be added
to your PATH.
This patch fixes the issue by removing the duplicate code that
should have been removed during the merge. Note that android-emulator
is still being added once to the PATH by code that appears before
in the script.
BUG=
17524154
Change-Id: Iaa03159b0c81b15ef4c7c420e2f76e0a48aba789
Ying Wang [Mon, 15 Sep 2014 18:45:52 +0000 (11:45 -0700)]
Enable multilib odex only if TARGET_2ND_ARCH is defined.
Bug:
17507247
Bug:
14694978
Change-Id: I160a37bc0970315054606829aa112b67eaee7d49
Jeff Arneson [Mon, 15 Sep 2014 16:53:15 +0000 (09:53 -0700)]
Refactor show_annotations_list to remove HTML tags from method params
No need to pass in the HTML tags to start and end the list, since
we do the same thing everywhere, and it wasn't very complete anyways.
Change-Id: I504b78b699a03cc5ba7c6f0584173087aab2024b
Ying Wang [Sun, 14 Sep 2014 20:49:13 +0000 (20:49 +0000)]
Merge "Support to build apk odex for both arch." into lmp-dev
Ying Wang [Sat, 13 Sep 2014 18:26:39 +0000 (11:26 -0700)]
Support to build apk odex for both arch.
Build odex for both arch in multilib build if an app has
LOCAL_MULTILIB := both.
Refactored the common setup code to a separate file setup_one_odex.mk.
Bug:
17409149
Bug:
14694978
Change-Id: I74c9426cd74fe0b0cb4811368f740a88ac2ae022
Tyler Gunn [Fri, 12 Sep 2014 16:19:59 +0000 (09:19 -0700)]
Renaming Telecomm to Telecom.
- Changing reference from Telecomm to Telecom.
Bug:
17364651
Change-Id: I5b7200396dfc5f0d4c62f9a1aa50bd4fdc04fccf
Jeff Arneson [Fri, 12 Sep 2014 18:24:59 +0000 (18:24 +0000)]
Merge "Show annotation information for fields, enums, etc. and in the class list" into lmp-dev
Brian Carlstrom [Fri, 12 Sep 2014 16:36:20 +0000 (16:36 +0000)]
Merge "Fix mma/mmma by making gettop canonicalize TOP when set" into lmp-dev
Esteban Talavera [Fri, 12 Sep 2014 10:35:47 +0000 (10:35 +0000)]
Merge "Added new 'adb dpm' command to the packages list." into lmp-dev
Brian Carlstrom [Fri, 12 Sep 2014 07:33:25 +0000 (00:33 -0700)]
Fix mma/mmma by making gettop canonicalize TOP when set
Bug:
17253957
Change-Id: Ifd6d5984f63981e1f99b6ae6f9459c2801588459
Ying Wang [Fri, 12 Sep 2014 01:15:55 +0000 (01:15 +0000)]
Merge "Conditionally skip boot jars package name check." into lmp-dev