OSDN Git Service
Clay Murphy [Thu, 9 Oct 2014 17:42:47 +0000 (17:42 +0000)]
am
96a81b18: am
fb68db08: Merge "Docs: Making source.android.com headers match those of developer.android.com"
* commit '
96a81b18ac1f01760a3ef573289cefdfbc810cb7':
Docs: Making source.android.com headers match those of developer.android.com
Clay Murphy [Thu, 9 Oct 2014 17:38:40 +0000 (17:38 +0000)]
am
fb68db08: Merge "Docs: Making source.android.com headers match those of developer.android.com"
* commit '
fb68db08000e2d22461edbfa663e298c672476c0':
Docs: Making source.android.com headers match those of developer.android.com
Clay Murphy [Thu, 9 Oct 2014 17:33:27 +0000 (17:33 +0000)]
Merge "Docs: Making source.android.com headers match those of developer.android.com"
Chih-Hung Hsieh [Thu, 9 Oct 2014 17:24:37 +0000 (17:24 +0000)]
am
8913e282: am
29373be8: Merge "Add -fPIC as default Clang mips ASFLAGS."
* commit '
8913e28295a9f93121fa60f74a6ff39eadd2e86d':
Add -fPIC as default Clang mips ASFLAGS.
Chih-Hung Hsieh [Thu, 9 Oct 2014 17:20:01 +0000 (17:20 +0000)]
am
29373be8: Merge "Add -fPIC as default Clang mips ASFLAGS."
* commit '
29373be81de4d6e8817434b146c395b2a28e4628':
Add -fPIC as default Clang mips ASFLAGS.
Chih-Hung Hsieh [Thu, 9 Oct 2014 17:17:07 +0000 (17:17 +0000)]
Merge "Add -fPIC as default Clang mips ASFLAGS."
Ying Wang [Thu, 9 Oct 2014 12:34:03 +0000 (12:34 +0000)]
am
edb9df24: Merge "Check to determine if we can run dex-preopt." into lmp-dev
* commit '
edb9df24d00091a5206ba36d7f32ed75d6c462b9':
Check $(built_dex) to determine if we can run dex-preopt.
Dan Albert [Thu, 9 Oct 2014 01:14:58 +0000 (01:14 +0000)]
am
24c1d149: am
a01fa4f8: Merge "LOCAL_NATIVE_COVERAGE should imply -O0."
* commit '
24c1d149678dcd03f679bfa0fc29386cee779935':
LOCAL_NATIVE_COVERAGE should imply -O0.
Dan Albert [Thu, 9 Oct 2014 01:01:39 +0000 (01:01 +0000)]
am
a01fa4f8: Merge "LOCAL_NATIVE_COVERAGE should imply -O0."
* commit '
a01fa4f8a369580a888317d0ea7f3507f4dcc828':
LOCAL_NATIVE_COVERAGE should imply -O0.
Dan Albert [Thu, 9 Oct 2014 00:56:23 +0000 (00:56 +0000)]
Merge "LOCAL_NATIVE_COVERAGE should imply -O0."
Dan Albert [Wed, 8 Oct 2014 06:37:53 +0000 (23:37 -0700)]
LOCAL_NATIVE_COVERAGE should imply -O0.
Optimization can lead to incorrect coverage results.
Change-Id: I8ade9ab246e292d26ac18821baf9970e29dc1a1f
Adam Lesinski [Wed, 8 Oct 2014 22:48:46 +0000 (22:48 +0000)]
am
811e650b: Merge "Add appops command to devices" into lmp-dev
* commit '
811e650b820ffa4f291d18d6f49673314848c810':
Add appops command to devices
Chih-Hung Hsieh [Wed, 8 Oct 2014 22:41:29 +0000 (15:41 -0700)]
Add -fPIC as default Clang mips ASFLAGS.
For mips target, gcc passes -KPIC to assembler by default,
but clang passes -KPIC only if -fPIC or -fpic is given.
BUG:
17895505
Change-Id: I7803adaf8ad7b40c6473872b67f4e0b4c502b38a
Ying Wang [Wed, 8 Oct 2014 22:25:17 +0000 (22:25 +0000)]
Merge "Check $(built_dex) to determine if we can run dex-preopt." into lmp-dev
Ying Wang [Wed, 8 Oct 2014 21:48:07 +0000 (14:48 -0700)]
Check $(built_dex) to determine if we can run dex-preopt.
Change-Id: Icfed37f50671ec041f2cfdcec9175cb094b572fc
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:38:40 +0000 (16:38 +0000)]
am
1a856098: Merge "Export build thumbprint only if the product has specified at least one oem fingerprint property" into lmp-dev
* commit '
1a856098ea819a75ad904ff6d6dcfac9545a02a6':
Export build thumbprint only if the product has specified at least one oem fingerprint property
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
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:23:18 +0000 (23:23 +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
Ying Wang [Tue, 7 Oct 2014 23:20:51 +0000 (23:20 +0000)]
am
e4e50f9b: am
8330c4c5: Merge "Apply LOCAL_CXX_STL to also prebuilts."
* commit '
e4e50f9bb4ae8af11aaddf9825a09ff33241b204':
Apply LOCAL_CXX_STL to also prebuilts.
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:32:12 +0000 (22:32 +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 [Tue, 7 Oct 2014 22:32:11 +0000 (22:32 +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
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
Ying Wang [Tue, 7 Oct 2014 21:15:38 +0000 (21:15 +0000)]
am
8330c4c5: Merge "Apply LOCAL_CXX_STL to also prebuilts."
* commit '
8330c4c5e6f8bb8b64e1b45ceed603b49853a086':
Apply LOCAL_CXX_STL to also prebuilts.
Ying Wang [Tue, 7 Oct 2014 21:11:30 +0000 (21:11 +0000)]
Merge "Apply LOCAL_CXX_STL to also prebuilts."
Ying Wang [Tue, 7 Oct 2014 20:03:29 +0000 (13:03 -0700)]
Apply LOCAL_CXX_STL to also prebuilts.
Because LOCAL_CXX_STL modifies a module's required shared libaries,
we need this for also prebuilt shared libraries and executables.
Change-Id: I418c26143999a613c40aadf990f131b123e0ac3d
Nicolas Geoffray [Tue, 7 Oct 2014 10:28:18 +0000 (10:28 +0000)]
Nicolas Geoffray [Tue, 7 Oct 2014 10:23:31 +0000 (10:23 +0000)]
Nicolas Geoffray [Tue, 7 Oct 2014 10:19:16 +0000 (10:19 +0000)]
Merge "Fix typo."
Nicolas Geoffray [Tue, 7 Oct 2014 10:17:09 +0000 (11:17 +0100)]
Fix typo.
Change-Id: I738ad878a2961d118b5a89bf7d434606df2fad92
Nicolas Geoffray [Tue, 7 Oct 2014 09:44:07 +0000 (09:44 +0000)]
am
a6b9e887: am
4af753c1: Merge "Make which dex2oat version to use configurable."
* commit '
a6b9e887b98152f913f4e6d9f864da00bc1cc21e':
Make which dex2oat version to use configurable.
Nicolas Geoffray [Tue, 7 Oct 2014 09:41:46 +0000 (09:41 +0000)]
am
4af753c1: Merge "Make which dex2oat version to use configurable."
* commit '
4af753c1d1e770419314108ad795b97d17b11380':
Make which dex2oat version to use configurable.
Nicolas Geoffray [Tue, 7 Oct 2014 09:38:17 +0000 (09:38 +0000)]
Merge "Make which dex2oat version to use configurable."
Nicolas Geoffray [Mon, 6 Oct 2014 13:53:59 +0000 (14:53 +0100)]
Make which dex2oat version to use configurable.
Change-Id: Ic13cf6f9dfb117193a5101781945c501d138955c
Dan Albert [Mon, 6 Oct 2014 18:46:03 +0000 (18:46 +0000)]
am
a3b31d7b: am
642c81ea: Merge "Stash original values of CC and CXX."
* commit '
a3b31d7b83254a644efd12de3de835594124ef65':
Stash original values of CC and CXX.
Dan Albert [Mon, 6 Oct 2014 18:46:02 +0000 (18:46 +0000)]
am
55c2adff: am
b6361968: Merge "Remove unused my_compiler_dependencies."
* commit '
55c2adfffac9b40992316938699cb36e0818fbbb':
Remove unused my_compiler_dependencies.
Dan Albert [Mon, 6 Oct 2014 18:36:43 +0000 (18:36 +0000)]
am
642c81ea: Merge "Stash original values of CC and CXX."
* commit '
642c81ea4559836236a38123feec3d8e51d4b9c2':
Stash original values of CC and CXX.
Dan Albert [Mon, 6 Oct 2014 18:36:42 +0000 (18:36 +0000)]
am
b6361968: Merge "Remove unused my_compiler_dependencies."
* commit '
b6361968f86a1e96e1cdf5451d62ea35541de1e3':
Remove unused my_compiler_dependencies.
Dan Albert [Mon, 6 Oct 2014 18:33:59 +0000 (18:33 +0000)]
Merge "Stash original values of CC and CXX."
Dan Albert [Mon, 6 Oct 2014 18:33:41 +0000 (18:33 +0000)]
Merge "Remove unused my_compiler_dependencies."
Dan Albert [Fri, 3 Oct 2014 20:29:42 +0000 (13:29 -0700)]
Remove unused my_compiler_dependencies.
my_compiler_dependencies was never assigned to, but the way it was
included in the rules prevented the user from being able to use | in
LOCAL_ADDITIONAL_DEPENDENCIES. Since it is unneeded, just remove it.
Change-Id: I74bb59e81b97756296060eea5b7a42909be50130
Dan Albert [Sat, 4 Oct 2014 20:51:57 +0000 (13:51 -0700)]
Stash original values of CC and CXX.
This way we can still access the real compiler as opposed to a wrapped
one.
Change-Id: I17ba30416a3eb8eda056c67faaa8b5957e70caea
Christopher Ferris [Sun, 5 Oct 2014 19:23:00 +0000 (19:23 +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
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:25:17 +0000 (22:25 +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
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
Clay Murphy [Fri, 3 Oct 2014 21:58:50 +0000 (14:58 -0700)]
Docs: Making source.android.com headers match those of developer.android.com
Bug:
17814801
Change-Id: I128a76b32b0d92118f621062c62d72460313f4d6
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:21:41 +0000 (19:21 +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 19:21:37 +0000 (19:21 +0000)]
am
a45c2e58: Merge "Add two useful character constants." into lmp-dev
* commit '
a45c2e5834ae6ff983e158c79f4fd65e09cdb766':
Add two useful character constants.
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:19:04 +0000 (17:19 +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 16:59:35 +0000 (16:59 +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:15:01 +0000 (21:15 +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:50:26 +0000 (16:50 +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:23:41 +0000 (15:23 +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:08:07 +0000 (01:08 +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:38:32 +0000 (23:38 +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:01:30 +0000 (23:01 +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:01:29 +0000 (23:01 +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
Dan Albert [Wed, 1 Oct 2014 20:50:08 +0000 (20:50 +0000)]
am
3594f5f0: am
9979ae43: Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h."
* commit '
3594f5f0ed04853f2171a7f0f719a1e25dba3b6d':
Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
Dan Albert [Wed, 1 Oct 2014 20:39:56 +0000 (20:39 +0000)]
am
9979ae43: Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h."
* commit '
9979ae4370e7acd4b305fddeca3c24495214a0cf':
Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
Dan Albert [Wed, 1 Oct 2014 20:35:56 +0000 (20:35 +0000)]
Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h."
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
Dan Albert [Wed, 1 Oct 2014 17:12:25 +0000 (10:12 -0700)]
Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
Change-Id: If2018529a6c067b63e1a59c16c911d63ec2ebbf4
Ying Wang [Wed, 1 Oct 2014 01:48:43 +0000 (01:48 +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 00:32:58 +0000 (17:32 -0700)]
Allow to add jar resource or manifest even without Java code.
Change-Id: I2d8fd93f004d9e0c29c71b887810b2624769789e
Tim Murray [Tue, 30 Sep 2014 23:52:13 +0000 (23:52 +0000)]
am
b7c92e14: am
35dd358c: Merge "Update prebuilt RS clcore location."
* commit '
b7c92e14f3c55b07ce17d96375781e434e5d3f1a':
Update prebuilt RS clcore location.
Chih-Hung Hsieh [Tue, 30 Sep 2014 23:52:08 +0000 (23:52 +0000)]
am
14012488: am
09cdd500: Merge "Clear all LOCAL_CLANG_*FLAGS*."
* commit '
140124884050264721e22cb08f713a7da76b36d4':
Clear all LOCAL_CLANG_*FLAGS*.
Tim Murray [Tue, 30 Sep 2014 22:40:39 +0000 (22:40 +0000)]
am
35dd358c: Merge "Update prebuilt RS clcore location."
* commit '
35dd358cc4fccb062bd90cb1f9404a582b4facd4':
Update prebuilt RS clcore location.
Tim Murray [Tue, 30 Sep 2014 22:34:58 +0000 (22:34 +0000)]
Merge "Update prebuilt RS clcore location."