LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,432 Commits 2 Branches 0 Tags
526ec3d500c04d5c61b51ea73317c16849592cf1
Commit Graph

12432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
c6ab3495ad am ce285571: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit 'ce285571ceb3b5165e81eb8522097d203696b918':
 2013-07-01 07:44:19 -07: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
d68fd63477 am a2ad5a69: am 163e7c5e: Merge "Add a sample showing how to use OpenGL ES 3.0" into jb-mr2-dev 
* commit 'a2ad5a69b7c9d0c1e3c7c54b5fbc4ea990827b22':
  Add a sample showing how to use OpenGL ES 3.0
 2013-06-29 21:11:34 -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
ef8bbefc70 am 2eceb17d: am 5e427929: Merge "Add GLESv3 to future NDK release" into jb-mr2-dev 
* commit '2eceb17d625e3b3d0cbff7feb31e337b4821de04':
  Add GLESv3 to future NDK release
 2013-06-29 21:06:13 -07: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
e7e82d9cd9 am a92d7452: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit 'a92d7452a3e864689844b3c2f0902fdf0a407755':
 2013-06-26 12:34:20 -07: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
b8e741f103 am 315a23dd: am 711343d4: am f3136431: am 6dcbcb7a: am 90b9ab16: Merge commit \'b1637825\' into manualmerge 
* commit '315a23dd1a0b40b38799c4ef052a5970781d39f2':
  Adjust the redirects for edu and a couple others.
 2013-06-26 11:54:58 -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
Ben Cheng
73644dd2c8 Add a new example/unittest for GDB's reverse debugging feature. 
Change-Id: Ic55343957cd35dc41d2dcf9f436d1940cd454084
 2013-06-24 14:48:19 -07:00
Ben Cheng
434ffc1f30 Merge "Add a GDB script to crawl the Dalvik stack." 2013-06-24 21:44:41 +00:00
Ben Cheng
0708600d53 Add a GDB script to crawl the Dalvik stack. 
Change-Id: I5635a2fc8a8fe8105527312429dd43139c8727a8
 2013-06-24 14:30:48 -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
7ce3f66078 am 4fa3e5ee: am e5499c53: am ae9621de: Merge "Fix wchar.h not to redefine WCHAR_MAX/WCHAR_MIN" 
* commit '4fa3e5ee0db978a89e9571e182ea5a2851a99022':
  Fix wchar.h not to redefine WCHAR_MAX/WCHAR_MIN
 2013-06-21 13:58:35 -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
518c10c9ba am e10c7bad: am ca71e0f9: am 720848df: Merge "Header comparison tool for Bionic vs NDK platforms" 
* commit 'e10c7bad4a3aef37c6e3983979452fdc5f8b07a8':
  Header comparison tool for Bionic vs NDK platforms
 2013-06-21 08:18:31 -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
f7b000b8c8 am f155953d: am a8c949ea: am 1db04560: Merge "Add clone in x86" 
* commit 'f155953d40b85e56ba04de23be342ac150472d10':
  Add clone in x86
 2013-06-20 09:40:15 -07: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
28024f4e9f am ca8c51e6: am ace0c1c3: am 91009134: Merge "stdint.h header is not fully compatible with C99(ISO9899:1999)" 
* commit 'ca8c51e6dfff12338377ff0651ef2c114f49f862':
  stdint.h header is not fully compatible with C99(ISO9899:1999)
 2013-06-19 13:36:41 -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
96538326e8 am b6f84589: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit 'b6f845895decc75e10ee399d1c1addaf38c0a871':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
 2013-06-18 11:51:24 -07: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
Igor Murashkin
87d6aede13 Merge "Add junit to eclipse classpath" 2013-06-17 21:47:26 +00:00
Igor Murashkin
d44ae772f1 Add junit to eclipse classpath 
Change-Id: I7144c3af4a46cbfaf7d0b477d005ae911b238c7a
 2013-06-17 14:37:26 -07:00