The Android Automerger
edeeb6356c
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-07-09 05:55:17 -07:00
Jeff Brown
a18be3116a
Revert "Remove mediarouter v7 support library from SDK."
...
This reverts commit 408c184614 .
Bug: 9425325
Change-Id: I340364c43f3040b454894e55a94be236ff999ce6
2013-07-09 00:35:10 +00:00
Andrew Hsieh
1175ccb028
am c7ef0a3c: am 56de69b3: Merge "ndk: <sys/cdefs.h>: make wchar_t 32-bit for all API levels."
...
* commit 'c7ef0a3c0379a2ca81b6f82a9746c3c5405b8598':
ndk: <sys/cdefs.h>: make wchar_t 32-bit for all API levels.
2013-07-08 16:01:54 -07:00
Andrew Hsieh
c7ef0a3c03
am 56de69b3: Merge "ndk: <sys/cdefs.h>: make wchar_t 32-bit for all API levels."
...
* commit '56de69b35beee71b7575fe86c0885f12523f481e':
ndk: <sys/cdefs.h>: make wchar_t 32-bit for all API levels.
2013-07-08 16:00:16 -07:00
Andrew Hsieh
56de69b35b
Merge "ndk: <sys/cdefs.h>: make wchar_t 32-bit for all API levels."
2013-07-08 22:59:16 +00:00
Fred Chung
b597143cce
am 7167a054: Bluetooth LE sample.
...
* commit '7167a054a8027f75025c865322fa84791a9b3bd1':
Bluetooth LE sample.
2013-07-08 15:22:09 -07:00
Fred Chung
7167a054a8
Bluetooth LE sample.
...
This sample demonstrates how to communicate with a Generic Attribute Profile (GATT) server over
Bluetooth Low Energy. This feature is available on Android 4.3 (API level 18) and above
platforms.
You can test this sample app using any Bluetooth Low Energy-capable devices. If the device
supports the Heart Rate Profile, the app will parse and display the heart rate.
Change-Id: I69a4955cb9929f837e81ad1c19145ff45bdd27ec
2013-07-08 13:22:56 -07:00
Andrew Hsieh
822b8e0705
am c42111c3: am 7fc5e915: Merge "Fix <inttypes.h> declaration for pointer-related PRI/SCN macros."
...
* commit 'c42111c3ed4c48a957b810c3f4d6f9f56f2f5931':
Fix <inttypes.h> declaration for pointer-related PRI/SCN macros.
2013-07-08 09:34:45 -07:00
Andrew Hsieh
c42111c3ed
am 7fc5e915: Merge "Fix <inttypes.h> declaration for pointer-related PRI/SCN macros."
...
* commit '7fc5e915158c638740e7fecf270b92038c696fa3':
Fix <inttypes.h> declaration for pointer-related PRI/SCN macros.
2013-07-08 09:32:09 -07:00
Andrew Hsieh
7fc5e91515
Merge "Fix <inttypes.h> declaration for pointer-related PRI/SCN macros."
2013-07-08 16:29:04 +00:00
David 'Digit' Turner
f85e243cdb
ndk: <sys/cdefs.h>: make wchar_t 32-bit for all API levels.
...
This patch ensures that wchar_t is a 32-bit number when targetting
API level < 9 (i.e. Froyo or older).
You can restore the previous (and broken) behaviour by defining
_WCHAR_IS_8BIT at compile time. See http://b.android.com/57267
for more context.
BUG=57267
Change-Id: Ib334e8fe95a3f592d5d4bb157b0f123984133597
2013-07-04 16:30:41 +02:00
David 'Digit' Turner
530a3ca575
Fix <inttypes.h> declaration for pointer-related PRI/SCN macros.
...
This ports the following Bionic libc fix to the NDK header:
https://android-review.googlesource.com/#/c/61703/2
BUG=57218
Change-Id: I0c5fef17f0c1bb3a89c00edf51f494cbf7bda435
2013-07-03 15:13:49 +02:00
The Android Open Source Project
ce285571ce
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: I84bdec1d34541c08fa2631e0c23ea2b28a6b5a00
2013-07-01 07:42:26 -07:00
The Android Automerger
09ad6acf12
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-30 05:55:18 -07:00
Jesse Hall
a2ad5a69b7
am 163e7c5e: Merge "Add a sample showing how to use OpenGL ES 3.0" into jb-mr2-dev
...
* commit '163e7c5e50124f6ea87e6aed49722bae1fd42563':
Add a sample showing how to use OpenGL ES 3.0
2013-06-29 21:09:49 -07:00
Jesse Hall
163e7c5e50
Merge "Add a sample showing how to use OpenGL ES 3.0" into jb-mr2-dev
2013-06-30 04:07:40 +00:00
Jesse Hall
2eceb17d62
am 5e427929: Merge "Add GLESv3 to future NDK release" into jb-mr2-dev
...
* commit '5e42792955753495f3643260b7a8af099dac32f9':
Add GLESv3 to future NDK release
2013-06-29 21:04:31 -07:00
Jesse Hall
5e42792955
Merge "Add GLESv3 to future NDK release" into jb-mr2-dev
2013-06-30 04:01:42 +00:00
The Android Open Source Project
a92d7452a3
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: I919b0c56af88eb60f2a3c055e6b99350b644cf26
2013-06-26 12:33:22 -07:00
The Android Automerger
8b33cdc20a
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-26 12:17:07 -07:00
Dirk Dougherty
315a23dd1a
am 711343d4: am f3136431: am 6dcbcb7a: am 90b9ab16: Merge commit \'b1637825\' into manualmerge
...
* commit '711343d46753cc702e60c85bfa27137a04ee6188':
Adjust the redirects for edu and a couple others.
2013-06-26 11:11:12 -07:00
Dirk Dougherty
711343d467
am f3136431: am 6dcbcb7a: am 90b9ab16: Merge commit \'b1637825\' into manualmerge
...
* commit 'f3136431df3319c415fde335f172f55f0d74494f':
Adjust the redirects for edu and a couple others.
2013-06-26 11:07:45 -07:00
Dirk Dougherty
f3136431df
am 6dcbcb7a: am 90b9ab16: Merge commit \'b1637825\' into manualmerge
...
* commit '6dcbcb7a539a7704672cc22dba3ac12cf5622b36':
Adjust the redirects for edu and a couple others.
2013-06-26 11:05:13 -07:00
Dirk Dougherty
6dcbcb7a53
am 90b9ab16: Merge commit \'b1637825\' into manualmerge
...
* commit '90b9ab16f9f8730f69905f56055c5364d26ce888':
Adjust the redirects for edu and a couple others.
2013-06-26 11:02:54 -07:00
Dirk Dougherty
90b9ab16f9
Merge commit 'b1637825' into manualmerge
...
Conflicts:
scripts/app_engine_server/redirects.yaml
Change-Id: If68fc5e8461f3f9d63d00cc251e4bed2531d7025
2013-06-26 10:58:30 -07:00
Dirk Dougherty
b1637825c1
am 392804d0: Adjust the redirects for edu and a couple others.
...
* commit '392804d01ce967c5ec4d00b710c7664f42c3d736':
Adjust the redirects for edu and a couple others.
2013-06-26 10:40:48 -07:00
Dirk Dougherty
392804d01c
Adjust the redirects for edu and a couple others.
...
Change-Id: I95049ad68a4ecc31354f9e97e10d83114be8bb78
2013-06-26 10:34:59 -07:00
Jesse Hall
a451b018f6
Add a sample showing how to use OpenGL ES 3.0
...
Change-Id: If834a23ad3ad2164e6fdc40f865ee28cfa93de7e
2013-06-24 11:12:42 -07:00
Andrew Hsieh
4fa3e5ee0d
am e5499c53: am ae9621de: Merge "Fix wchar.h not to redefine WCHAR_MAX/WCHAR_MIN"
...
* commit 'e5499c53e87ebcfd882f0e6ed6059a2cc7166b44':
Fix wchar.h not to redefine WCHAR_MAX/WCHAR_MIN
2013-06-21 13:54:48 -07:00
Andrew Hsieh
e5499c53e8
am ae9621de: Merge "Fix wchar.h not to redefine WCHAR_MAX/WCHAR_MIN"
...
* commit 'ae9621de63000a4c54e95fc9424f7a02f2d9af9a':
Fix wchar.h not to redefine WCHAR_MAX/WCHAR_MIN
2013-06-21 13:52:51 -07:00
Andrew Hsieh
ae9621de63
Merge "Fix wchar.h not to redefine WCHAR_MAX/WCHAR_MIN"
2013-06-21 20:51:55 +00:00
Andrew Hsieh
f56a37e539
Fix wchar.h not to redefine WCHAR_MAX/WCHAR_MIN
...
Change-Id: I6c6f2e020b72cce4c8665133ea0a0c5db977e348
2013-06-21 11:11:35 -07:00
Andrew Hsieh
e10c7bad4a
am ca71e0f9: am 720848df: Merge "Header comparison tool for Bionic vs NDK platforms"
...
* commit 'ca71e0f9da8c77f9c13e38e1b26f530df3925afa':
Header comparison tool for Bionic vs NDK platforms
2013-06-21 08:16:05 -07:00
Andrew Hsieh
ca71e0f9da
am 720848df: Merge "Header comparison tool for Bionic vs NDK platforms"
...
* commit '720848df0b749e6c6f97249fcf7f9d5afce5be53':
Header comparison tool for Bionic vs NDK platforms
2013-06-21 08:12:21 -07:00
Andrew Hsieh
720848df0b
Merge "Header comparison tool for Bionic vs NDK platforms"
2013-06-21 15:09:51 +00:00
Grigoriy Kraynov
a67bdae6b1
Header comparison tool for Bionic vs NDK platforms
...
This tool is useful to compare headers between Bionic and NDK platforms.
It shows a summary list of non-equal headers and writes diff report to file.
See 'ndk/tools/headers-diff-bionic-vs-ndk.py --help' for details.
Change-Id: I3a9cf8a5e2dc862e34e27ab343ca17a0b4597b4d
Signed-off-by: Grigoriy Kraynov <grigoriy.kraynov@intel.com >
2013-06-21 14:01:40 +00:00
Andrew Hsieh
f155953d40
am a8c949ea: am 1db04560: Merge "Add clone in x86"
...
* commit 'a8c949ea49a2e0a350732b79669ca590ba1bc1ea':
Add clone in x86
2013-06-20 09:37:05 -07:00
Andrew Hsieh
a8c949ea49
am 1db04560: Merge "Add clone in x86"
...
* commit '1db0456074007500c7e289e893e41149f8d8ff3c':
Add clone in x86
2013-06-20 09:34:34 -07:00
Andrew Hsieh
1db0456074
Merge "Add clone in x86"
2013-06-20 16:31:42 +00:00
WenHan Gu
3d4172fa77
Workaround for libportable wait4 implementation.
...
Follow https://android-review.googlesource.com/#/c/55573 and
this should be revert once being solved.
Change-Id: Ib9dabc1effaf59d541bc80bfce3f250a3d5fc8b2
2013-06-20 12:15:40 +08:00
Andrew Hsieh
d166ec49f9
Add clone in x86
...
clone is already declared in header and exists in both arm/mips libc.
Add the missing one in libc.so and libc.a (*1) for x86.
(*) only updated bionic_clone.o and clone.o from build after
22d366cc09383956dc264ed4641572e609392eee
Change-Id: Ibcb39948d48b84398543d84304ead21dab534c40
2013-06-19 18:02:20 -07:00
Andrew Hsieh
ca8c51e6df
am ace0c1c3: am 91009134: Merge "stdint.h header is not fully compatible with C99(ISO9899:1999)"
...
* commit 'ace0c1c3db52ba5565c8d282f6c9886821bcc217':
stdint.h header is not fully compatible with C99(ISO9899:1999)
2013-06-19 13:34:09 -07:00
Andrew Hsieh
ace0c1c3db
am 91009134: Merge "stdint.h header is not fully compatible with C99(ISO9899:1999)"
...
* commit '91009134462a1757982e5e80064075e52295e57c':
stdint.h header is not fully compatible with C99(ISO9899:1999)
2013-06-19 13:31:29 -07:00
Andrew Hsieh
9100913446
Merge "stdint.h header is not fully compatible with C99(ISO9899:1999)"
2013-06-19 20:30:02 +00:00
The Android Open Source Project
b6f845895d
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: I15e9b02a55ce4d6a46afed52a732f3bbcf8e8470
2013-06-18 11:50:32 -07:00
Robert Ly
61b7f7e516
Revert "make target for gms and gcm javadocs and to automate entire docs build"
...
This reverts commit 2deefec495 .
Change-Id: I60be16d5233568a8ffcf6ec09952261b854275a8
2013-06-18 11:36:53 -07:00
Jesse Hall
c05863dac1
Add GLESv3 to future NDK release
...
* Headers were copied from frameworks/native/opengl/include/GLES3/.
* Symbol lists were generated with ndk/build/tools/gen-system-symbols.sh.
* Symbols are identical between architectures
Change-Id: I011094ea3b479cf166ffb6bef3778cde683fc502
2013-06-18 10:19:36 -07:00
Robert Ly
8bf01cd351
am 4268df44: am 61cf8608: am 58a0f1bc: am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
...
* commit '4268df44c2134d145f35a350d1b4bf1a0ee7ac81':
2013-06-17 10:03:57 -07:00
Robert Ly
c89b3f1ded
am 9fc688f4: am 6e58370c: am 4d3ff06e: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
...
* commit '9fc688f47ace1f6fc3ca8f4cef340dd6a1cd967b':
Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 10:03:54 -07:00
Robert Ly
4268df44c2
am 61cf8608: am 58a0f1bc: am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
...
* commit '61cf860801f1106d71124c69deebfb53ec25ac69':
2013-06-17 10:00:10 -07:00