Commit Graph

12087 Commits

Author SHA1 Message Date
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
Robert Ly
9fc688f47a am 6e58370c: am 4d3ff06e: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
* commit '6e58370c0198221979eef9879b5fb8e22a0f1b1b':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 10:00:09 -07:00
Robert Ly
61cf860801 am 58a0f1bc: am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
* commit '58a0f1bc860e6603970c5178294a7dd1709e9dad':
2013-06-17 09:57:56 -07:00
Robert Ly
6e58370c01 am 4d3ff06e: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
* commit '4d3ff06ef1fea7a18d04a013ec0e077ccf89394e':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 09:57:55 -07:00
Robert Ly
58a0f1bc86 am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
* commit 'af5f663ae05c86e52e0ff6cbe028748992118643':
2013-06-17 09:56:02 -07:00
Robert Ly
4d3ff06ef1 am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
* commit '5632947990326ebb2cd81e567e7b0d282672c2fd':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 09:55:14 -07:00
Robert Ly
af5f663ae0 am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
* commit '5632947990326ebb2cd81e567e7b0d282672c2fd':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 09:54:43 -07:00
Robert Ly
5632947990 am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
* commit '6bd35b5bd685355b673a36ed96b77ddd13a0bff4':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 09:52:40 -07:00
Robert Ly
6bd35b5bd6 Revert "make target for gms and gcm javadocs and to automate entire docs build"
This reverts commit 2deefec495.

Change-Id: I60be16d5233568a8ffcf6ec09952261b854275a8
2013-06-17 16:10:59 +00:00
The Android Open Source Project
3fe981e26a Reconcile with jb-mr2-release - do not merge
Change-Id: Icce5a029a8cfb3444ece5f8c489f75619ed67a77
2013-06-16 07:43:44 -07:00
Jeff Brown
b2ce8ab56e Remove mediarouter v7 support library from SDK.
Bug: 9425325
Change-Id: I9459fa005c4801cac0c2e28c5afb414620241ad9
2013-06-15 12:20:32 -07:00
Jeff Brown
d908a88a80 am 408c1846: Remove mediarouter v7 support library from SDK.
* commit '408c1846145bf99a821fe1fafc48ddbb5a2a6ad5':
  Remove mediarouter v7 support library from SDK.
2013-06-14 16:42:10 -07:00
Jeff Brown
408c184614 Remove mediarouter v7 support library from SDK.
Bug: 9425325
Change-Id: I9459fa005c4801cac0c2e28c5afb414620241ad9
2013-06-14 15:47:52 -07:00
Robert Ly
b7b0727580 am 1630db41: am 3d1ead8f: am 2336733e: am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
* commit '1630db410d8c130521c752ee5408934861795b62':
2013-06-13 15:43:54 -07:00
Robert Ly
72a09286df am c3034939: am ecd39491: am c3e7bbaf: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
* commit 'c3034939315336e91d295cc2dc02e669fef45296':
  make target for gms and gcm javadocs and to automate entire docs build
2013-06-13 15:43:53 -07:00
Robert Ly
1630db410d am 3d1ead8f: am 2336733e: am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
* commit '3d1ead8f391d560b8721355a4909af2567fa67b4':
2013-06-13 15:42:27 -07:00
Robert Ly
c303493931 am ecd39491: am c3e7bbaf: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
* commit 'ecd39491d7314b9d8e5de1b11ce100371c2c5409':
  make target for gms and gcm javadocs and to automate entire docs build
2013-06-13 15:42:25 -07:00
Robert Ly
3d1ead8f39 am 2336733e: am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
* commit '2336733e7c8dc773b619e648b30b18f91fa6e952':
2013-06-13 15:40:33 -07:00
Robert Ly
ecd39491d7 am c3e7bbaf: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
* commit 'c3e7bbaf00207bf36a2082cece68f7d6c0bf94af':
  make target for gms and gcm javadocs and to automate entire docs build
2013-06-13 15:40:32 -07:00
Robert Ly
2336733e7c am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
* commit '0e7706f3071b1edc4bd0af673c0ac44cbfe0cd71':
2013-06-13 15:37:06 -07:00
Robert Ly
c3e7bbaf00 am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
* commit '128c2f0265307ef5f36bd073148b46ef545db1c2':
  make target for gms and gcm javadocs and to automate entire docs build
2013-06-13 15:36:30 -07:00