Andrew Hsieh
e86297fc27
am 445331f5: Merge "Add TCP_INFO state enum values."
...
* commit '445331f5e1b20c5e9b6017cc1e291c37e6d4c63c':
Add TCP_INFO state enum values.
2013-07-29 20:26:05 -07:00
Andrew Hsieh
445331f5e1
Merge "Add TCP_INFO state enum values."
2013-07-30 03:19:29 +00:00
Andrew Hsieh
65675341ac
Add TCP_INFO state enum values.
...
See b.android.com/38881 and fix in bionic
0dff43cab41e4a0bd5bd018584952c68cb224977
Change-Id: I2417fe3cf43919bf363f36c337ea6813f13699d8
2013-07-29 20:15:57 -07:00
Andrew Hsieh
37684af0c0
am 7a85c344: Merge "Update x86 crtfiles from bionic with C versions"
...
* commit '7a85c344ff0468dbd7d78563a1ab668d2d184305':
Update x86 crtfiles from bionic with C versions
2013-07-29 17:48:56 -07:00
Andrew Hsieh
7a85c344ff
Merge "Update x86 crtfiles from bionic with C versions"
2013-07-30 00:43:58 +00:00
Chris Banes
fe17cee4e4
Fix ActionBarUsage in Support7Demos
...
It was using SearchViewCompat and causing an FC
Change-Id: Ib69a6d68b29cc9669a6595bdd75b5369458f561b
2013-07-26 10:15:07 +01:00
Xavier Ducrohet
c6e0fb17b4
am 583fc099: Merge "Strip dynamic libraries to reduce size." into jb-mr2-dev
...
* commit '583fc0990bcf055ceccfb31ad8d1f11715982bb8':
Strip dynamic libraries to reduce size.
2013-07-25 14:55:40 -07:00
Xavier Ducrohet
583fc0990b
Merge "Strip dynamic libraries to reduce size." into jb-mr2-dev
2013-07-25 21:49:41 +00:00
Xavier Ducrohet
cefd49aae6
Strip dynamic libraries to reduce size.
...
Change-Id: Ic43c7cc3dfca82e359abf8ef4c3259ac06eaa7dc
2013-07-25 14:48:26 -07:00
Siva Velusamy
ba21c2c7ed
am fb7ec3f1: Update platform tools version from 18.0.0 to 18.0.1
...
* commit 'fb7ec3f168bd43ab0a0a1faad7d31b1e2498826f':
Update platform tools version from 18.0.0 to 18.0.1
2013-07-25 14:17:52 -07:00
Siva Velusamy
fb7ec3f168
Update platform tools version from 18.0.0 to 18.0.1
...
systrace is now present in platform-tools
Change-Id: Ib1c418bd47f03d3cfb6a5cd41c9033b81ab08ef9
2013-07-25 14:02:26 -07:00
Xavier Ducrohet
d2a10cb312
am 67b7a3a3: Merge "Remove .so from the windows build-tools." into jb-mr2-dev
...
* commit '67b7a3a3fc47db88c901bde9ca3c49e6ae7055bc':
Remove .so from the windows build-tools.
2013-07-25 12:55:30 -07:00
Xavier Ducrohet
67b7a3a3fc
Merge "Remove .so from the windows build-tools." into jb-mr2-dev
2013-07-25 19:50:17 +00:00
Xavier Ducrohet
e4e1580738
am 1fda1889: Merge "Add dynamic libraries for renderscript." into jb-mr2-dev
...
* commit '1fda1889052050ecf5de9c8d5a0b7c70fe0183ad':
Add dynamic libraries for renderscript.
2013-07-25 12:36:41 -07:00
Xavier Ducrohet
9368498dc3
Remove .so from the windows build-tools.
...
Change-Id: I7c8610a5c4aec36bcdf56607189e273944738124
2013-07-25 12:36:16 -07:00
Xavier Ducrohet
1fda188905
Merge "Add dynamic libraries for renderscript." into jb-mr2-dev
2013-07-25 19:30:53 +00:00
Xavier Ducrohet
afda1d33de
Add dynamic libraries for renderscript.
...
The new llvm-rs-cc compiler is not statically linked
anymore so those libraries are needed.
Also add the new support stuff.
Change-Id: I4d56f0b07f0f0f120b512726689ae4ff07f38322
2013-07-25 12:24:21 -07:00
Pavel Chupin
e5c9f8ec5a
Update x86 crtfiles from bionic with C versions
...
Files are copied as is from bionic head.
Also adding arch-x86_64 symlink to be able to generate arch-x86_64
crtfiles/libs.
Change-Id: I0b40c1c19bb4e3b24b25fa2bcb9236469fa32a3e
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-07-25 20:55:38 +04:00
Trevor Johns
f6f2808c53
am 2a4aa3cd: Remove AppRestrictions and BluetoothLeGatt samples
...
* commit '2a4aa3cd5dc0f13f676ed1994e6748a156eb5801':
Remove AppRestrictions and BluetoothLeGatt samples
2013-07-24 16:55:15 -07:00
Joe Fernandez
7ac04c7214
am f8a92396: Merge "docs: Redirect Support Library page to new location" into jb-mr2-dev
...
* commit 'f8a92396babb6592bb8780866def23795f3dab70':
docs: Redirect Support Library page to new location
2013-07-24 16:20:24 -07:00
Raphael Moll
3b8f4f9ae0
am cea9fb7b: Add bcc_compat to Windows whitelist.
...
* commit 'cea9fb7b4a9e6dd14b1aced1668094c45991b990':
Add bcc_compat to Windows whitelist.
2013-07-24 16:19:54 -07:00
Trevor Johns
4ffdba0e4f
am af0ab077: Remove samples/legacy from sdk.atree
...
* commit 'af0ab077f336b45b1d099941d93c1c0737d4967b':
Remove samples/legacy from sdk.atree
2013-07-24 16:19:51 -07:00
Trevor Johns
ba27e57c3c
am 1ffb3507: Add new sample tree to SDK build
...
* commit '1ffb35074a304a94d343c21f8d1713396d0efe80':
Add new sample tree to SDK build
2013-07-24 16:19:50 -07:00
Trevor Johns
2a4aa3cd5d
Remove AppRestrictions and BluetoothLeGatt samples
...
These have been moved to the new samples repository in
developers/samples/android.
Change-Id: I77312ea146ccb47ec8ecf38c9448149ec4c34962
2013-07-24 12:36:28 -07:00
Trevor Johns
da67d18b5b
Add common directory to BasicSyncAdapter sample
...
This directory will be automatically copied over using a
templating system in the future, but for now it needs to
be copied in using sdk.atree.
This also allows us to remove the symlink that was checked
in previously, and which likely won't work on Windows.
Change-Id: If3d78eec7c1b845d1ae1caca59099d3284bdf73a
2013-07-24 12:31:16 -07:00
Joe Fernandez
f8a92396ba
Merge "docs: Redirect Support Library page to new location" into jb-mr2-dev
2013-07-24 06:14:57 +00:00
Joe Fernandez
0178565349
docs: Redirect Support Library page to new location
...
Change-Id: I49b3a7ed9e7c9499ca76e3d50ca02454ac5846cb
2013-07-23 21:52:49 -07:00
Raphael Moll
cea9fb7b4a
Add bcc_compat to Windows whitelist.
...
Change-Id: I2b877d9fba8b0dc258a4dfd282bff0d21b77af0f
(cherry picked from commit 2fdc05f83e )
2013-07-23 23:53:05 +00:00
Trevor Johns
af0ab077f3
Remove samples/legacy from sdk.atree
...
This directory is only on my local machine, and doesn't
really exist. :)
Change-Id: Iea29b3f06fd089a5dca0f990cca058d9c2e7179b
2013-07-23 16:03:08 -07:00
Trevor Johns
1ffb35074a
Add new sample tree to SDK build
...
Old samples will live in samples/${PLATFORM_NAME}/legacy.
New samples are sorted by category, and come from
developers/samples/android.
Change-Id: I573ba4f58d701eac4896ae795d041cae4b9a9794
2013-07-23 15:54:23 -07:00
Xavier Ducrohet
513a888dfa
am b7ed7bec: Add support-v4 to the appcompat lib.
...
* commit 'b7ed7bec1f3276dde7c4e3771dc59a844540d47e':
Add support-v4 to the appcompat lib.
2013-07-23 12:42:14 -07:00
Xavier Ducrohet
b7ed7bec1f
Add support-v4 to the appcompat lib.
...
Change-Id: I2676ca4705e5dca15388e3759ba3a644fbae2b9b
2013-07-23 12:31:50 -07:00
Siva Velusamy
836202974f
am 31cc1650: Merge "Release systrace into platform-tools" into jb-mr2-dev
...
* commit '31cc1650cf4509d0b5e4c236f28b2e7620104e42':
Release systrace into platform-tools
2013-07-22 13:58:17 -07:00
Siva Velusamy
31cc1650cf
Merge "Release systrace into platform-tools" into jb-mr2-dev
2013-07-22 20:53:51 +00:00
Andrew Hsieh
293c746bdc
am f05c9f97: am 85f9f764: Merge "Workaround for libportable wait4 implementation."
...
* commit 'f05c9f97b39d4d17658577416dcc16d85c7582db':
Workaround for libportable wait4 implementation.
2013-07-22 12:17:45 -07:00
Andrew Hsieh
f05c9f97b3
am 85f9f764: Merge "Workaround for libportable wait4 implementation."
...
* commit '85f9f764507761e011fc14398e7ddf08b5d383c5':
Workaround for libportable wait4 implementation.
2013-07-22 12:14:00 -07:00
Andrew Hsieh
85f9f76450
Merge "Workaround for libportable wait4 implementation."
2013-07-22 19:11:18 +00:00
Fred Chung
8905657ea4
am 19dd9d20: Merge "Removed redundant launcher icon reference." into jb-mr2-dev
...
* commit '19dd9d200cc6783b468c4392a724dc1dd1f15523':
Removed redundant launcher icon reference.
2013-07-22 11:42:41 -07:00
Fred Chung
19dd9d200c
Merge "Removed redundant launcher icon reference." into jb-mr2-dev
2013-07-22 18:37:53 +00:00
Fred Chung
6758cf0530
Removed redundant launcher icon reference.
...
Change-Id: I637736a97744db79e803e1fba4b5c0bd993e4e53
2013-07-22 11:33:02 -07:00
Fred Chung
9aa3da19b5
am 63bc4aaf: Merge "App restriction for restricted profile sample." into jb-mr2-dev
...
* commit '63bc4aaf4cef9e82fd6554f6a06f64815b809c6e':
App restriction for restricted profile sample.
2013-07-22 11:32:00 -07:00
Fred Chung
63bc4aaf4c
Merge "App restriction for restricted profile sample." into jb-mr2-dev
2013-07-22 18:25:54 +00:00
Andrew Hsieh
615bd1f449
am 54009f7e: am 5d774594: Merge "ndk: Fix WCHAR_MIN / WCHAR_MAX definitions."
...
* commit '54009f7e95e2f9fffbcc771b4495a72045c5f381':
ndk: Fix WCHAR_MIN / WCHAR_MAX definitions.
2013-07-22 09:32:32 -07:00
Andrew Hsieh
54009f7e95
am 5d774594: Merge "ndk: Fix WCHAR_MIN / WCHAR_MAX definitions."
...
* commit '5d7745946dfc76dc2c82ef4ff097dedd8913e393':
ndk: Fix WCHAR_MIN / WCHAR_MAX definitions.
2013-07-22 09:30:19 -07:00
Andrew Hsieh
5d7745946d
Merge "ndk: Fix WCHAR_MIN / WCHAR_MAX definitions."
2013-07-22 16:28:08 +00:00
Fred Chung
b71371d3af
App restriction for restricted profile sample.
...
This sample demonstrates how to expose restrictions for a restricted user on a multiuser device. This feature is available on Android 4.3 (API level 18) and above platforms.
Change-Id: I4ef1bbda8e530dd8370d754de814fce96eaae1f1
2013-07-21 23:19:18 -07:00
David 'Digit' Turner
fe8625d401
ndk: Fix WCHAR_MIN / WCHAR_MAX definitions.
...
This fixes WCHAR_MIN / WCHAR_MAX to be signed / unsigned based on
the target ABI.
This only impacts ARM where wchar_t is really 'unsigned int'.
One can define _WCHAR_IS_ALWAYS_SIGNED to restore the old behaviour.
See http://b.android.com/55749
Change-Id: Idb63b7b11aecd3cfee37f5b6dd2eba78b308876f
2013-07-20 00:56:53 +02:00
Siva Velusamy
28f992a9cd
Release systrace into platform-tools
...
Change-Id: Id05c92f96ecb38c5a056d51ba86ea2e91a45733d
2013-07-19 15:05:24 -07:00
Dirk Dougherty
b4cddf93e3
am c821270d: am 80f50242: am d06f4e32: am 6ac22572: Update appengine server to handle \'@\'.
...
* commit 'c821270d716ca73a998ece17c9d5bf593bdf590e':
Update appengine server to handle '@'.
2013-07-19 13:43:05 -07:00
Dirk Dougherty
c821270d71
am 80f50242: am d06f4e32: am 6ac22572: Update appengine server to handle \'@\'.
...
* commit '80f50242895afb4b43b231af5e78fcc8c5004206':
Update appengine server to handle '@'.
2013-07-17 10:24:47 -07:00