Andrew Hsieh
76f93a10db
am c1d3bef5: Merge "[MIPS] Add Support errno, Added Logging, sorted Android.mk files."
...
* commit 'c1d3bef5cc18258beb94f804f83c944ab578eced':
[MIPS] Add Support errno, Added Logging, sorted Android.mk files.
2012-10-05 02:23:25 -07:00
Andrew Hsieh
c1d3bef5cc
Merge "[MIPS] Add Support errno, Added Logging, sorted Android.mk files."
2012-10-05 02:12:51 -07:00
Pete Delaney
25cabbf92e
[MIPS] Add Support errno, Added Logging, sorted Android.mk files.
...
Change-Id: Ibeeab51feb77be07ea8ccacf2f448bb5135d7373
Signed-off-by: Chris Dearman <chris@mips.com >
Signed-off-by: Pete Delaney <piet@mips.com >
2012-10-05 00:23:49 -07:00
Jean-Baptiste Queru
6dd8880cc9
Reconcile with jb-dev - do not merge
...
Change-Id: Ie0ff01ab85c75e2dc14c12c14ff641aa4cf54b58
2012-10-03 15:22:04 -07:00
Andrew Hsieh
24e005a234
am c7daea04: Merge "Replace __unused in linux/sysctl.h with __linux_unused"
...
* commit 'c7daea046b9f05fb07936bafd2f7436478781a2d':
Replace __unused in linux/sysctl.h with __linux_unused
2012-09-26 15:48:00 -07:00
Andrew Hsieh
c7daea046b
Merge "Replace __unused in linux/sysctl.h with __linux_unused"
2012-09-26 15:32:50 -07:00
Andrew Hsieh
36ffaf5406
Replace __unused in linux/sysctl.h with __linux_unused
...
To avoid conflict with "#define __unused" in sys/cdefs.h
See
https://android-review.googlesource.com/#/c/43479
https://android-review.googlesource.com/#/c/43565
Change-Id: I6b8155570f4398b3ee8845d75bd231bca7f1d86f
2012-09-26 15:11:39 -07:00
Xavier Ducrohet
45825eae6b
Update platform-tools sdk comp to 15.
...
Change-Id: Icdcf530ea223c1181b9be9bc1029f126c5558f1d
2012-09-24 14:54:59 -07:00
Andrew Hsieh
47b1e0b6f7
am b07d7f6c: Merge "Update NDK headers"
...
* commit 'b07d7f6c25fe3ea99186c2cdb034449e75419518':
Update NDK headers
2012-09-24 14:03:09 -07:00
Andrew Hsieh
b07d7f6c25
Merge "Update NDK headers"
2012-09-24 13:54:51 -07:00
Andrew Hsieh
c6427a73a2
Update NDK headers
...
Sync NDK headers with bionic's. Most are new symbols.
The only big differences are in arch-mips/include/asm:
1) arch-mips/include/asm/unistd.h, see
https://android-review.googlesource.com/#/c/40875
2) arch-mips/include/asm/*, see
https://android-review.googlesource.com/#/c/43335
https://android-review.googlesource.com/#/c/43440
https://android-review.googlesource.com/#/c/43401
Change-Id: I8204f9b5f2f2c14a31dc28efc8a9d8c66cf73fe2
2012-09-24 12:31:43 -07:00
Andrew Hsieh
b034233afa
am 3c901267: Merge "Update README.CRT.TXT"
...
* commit '3c901267609c17645999aa7a8ca95413ad528038':
Update README.CRT.TXT
2012-09-24 09:28:50 -07:00
Andrew Hsieh
3c90126760
Merge "Update README.CRT.TXT"
2012-09-24 09:24:05 -07:00
Andrew Hsieh
a0de803db8
Update README.CRT.TXT
...
Change-Id: I7d0ec48c09c47081c01c9366faf993317990b237
2012-09-21 18:50:16 -07:00
Dirk Dougherty
09bb223b97
Doc change: Add temporary redirect for dac/live to dgc/live.
...
Change-Id: I5a999abb6228f9a2b5d589e6e51176ecf930abe4
2012-09-12 09:24:04 -07:00
Dirk Dougherty
bc93334be2
Doc change: redirect accessibility best practices to new location.
...
Change-Id: I4c4d96ed07ecd4640f98d3c5a719cb24f48ab94f
2012-09-10 12:02:50 -07:00
Andrew Hsieh
4102c6f241
am b833605a: Merge "Rewrite ARM crtbegin* as C files"
...
* commit 'b833605a2bf5c27ff57cf5508fc58bca351c2470':
Rewrite ARM crtbegin* as C files
2012-09-06 18:30:03 -07:00
Andrew Hsieh
b833605a2b
Merge "Rewrite ARM crtbegin* as C files"
2012-09-06 18:14:38 -07:00
Andrew Hsieh
d0b834c7ad
Rewrite ARM crtbegin* as C files
...
This is port of related CLs:
9d40326830c2bd407427889c554adeb915ee6b4a
f3cfcd869ded41d25c1f4f4e48e7c374a64f9583
Summary: By placing __PREINIT_ARRAY__, __INIT_ARRAY__, __FINI_ARRAY__
and __CTOR_LIST__ on stack, this change allows PIC w/o relying on text
relocations.
Change-Id: I02a1b496b16aba692f4f9fa998a71efd943689fd
2012-09-06 15:27:56 +08:00
Andrew Hsieh
3bc200de51
am 9864b880: Merge "Replace deprecated APIs in NDK samples"
...
* commit '9864b8803782378159761424dee2270a12833872':
Replace deprecated APIs in NDK samples
2012-08-30 08:23:48 -07:00
Andrew Hsieh
9864b88037
Merge "Replace deprecated APIs in NDK samples"
2012-08-30 08:17:05 -07:00
Andrew Hsieh
eb703bf543
Replace deprecated APIs in NDK samples
...
1. hello-gl2 from android-5 to android-7
2. native-activity from android-9 to android-10
3. native-audio from android-9 to android-10
4. native-plasma from android-9 to android-10
Related CL
https://android-review.googlesource.com/#/c/42218 , which
adjusts android-10 to use android-9 header/lib
Related issue:
http://code.google.com/p/android/issues/detail?id=20017
Change-Id: I49c4c0dd2cedb34522a9d196211ee96fce21b6c4
2012-08-30 13:02:53 +08:00
Xavier Ducrohet
b1b6735cd6
Prepare for JB SDK rev 3
...
Change-Id: I3b1beb1ff2e12ed39631f6f96379819a0cea6b3c
2012-08-29 16:36:54 -07:00
Raphael Moll
0c11d9258f
am 3fda35f2: Merge "Windows USB Driver for generic + Q, rev 7."
...
* commit '3fda35f2c9cc3910a9fbab92b4b73e9891387fc5':
Windows USB Driver for generic + Q, rev 7.
2012-08-29 11:06:12 -07:00
Raphael Moll
3fda35f2c9
Merge "Windows USB Driver for generic + Q, rev 7."
2012-08-29 10:56:46 -07:00
Andrew Hsieh
87485cd822
am fcc2452b: Merge "Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S."
...
* commit 'fcc2452b5102b412ba300243e0e9d26c827515cf':
Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S.
2012-08-28 23:17:32 -07:00
Andrew Hsieh
fcc2452b51
Merge "Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S."
2012-08-28 23:08:56 -07:00
Raphael Moll
4d64923bb8
Windows USB Driver for generic + Q, rev 7.
...
(Cherry-picked from master c9533ad3cf )
Change-Id: Ia18fe5f08a6e2c6040e61f3105cff71cb3f4f8e5
2012-08-28 13:23:47 -07:00
Chao-Ying Fu
75f8d8217e
Remove unused .ctors, .dtors, and .eh_frame in MIPS crt*_so.S.
...
Change-Id: I9b2d28c7c189d0f3a2ded694fadd0380cfd8e6e5
2012-08-28 13:21:42 -07:00
Adam Koch
a4877aed76
Merge "Updating code sample for "displaying bitmaps efficiently" training class. Changes: -Use updated versions of ImageWorker & ImageCache from I/O 2012 app -Use copied DiskLruCache from system (rather than custom) -Use copied AsyncTask from system (to keep behavior consistent) -Ensure no strict mode violations or lint errors -Other misc bug fixes -Move single-use static methods in Utils to corresponding class" into jb-dev
2012-08-28 07:42:11 -07:00
The Android Open Source Project
0c8806a484
Reconcile with jb-mr0-release - do not merge
...
Change-Id: Iaa7372f223059e828c2f256c83b8d6e7d39bd74a
2012-08-27 14:11:00 -07:00
The Android Automerger
bda8a3659a
merge in jb-mr0-release history after reset to jb-dev
2012-08-23 21:30:13 -07:00
Adam Koch
03ceb37f79
Updating code sample for "displaying bitmaps efficiently" training class.
...
Changes:
-Use updated versions of ImageWorker & ImageCache from I/O 2012 app
-Use copied DiskLruCache from system (rather than custom)
-Use copied AsyncTask from system (to keep behavior consistent)
-Ensure no strict mode violations or lint errors
-Other misc bug fixes
-Move single-use static methods in Utils to corresponding class
Change-Id: If21e045db1e1a80391169f3c9c9258d48345ab6b
2012-08-23 16:41:05 -04:00
Andrew Hsieh
82043724c4
am 9cf4d01b: am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
...
* commit '9cf4d01b7c46401ba632db2efa471bb262bc30aa':
Support asm/sockios.h for MIPS.
2012-08-22 16:52:58 -07:00
Andrew Hsieh
9cf4d01b7c
am 51f72cc1: Merge "Support asm/sockios.h for MIPS."
...
* commit '51f72cc1bdd6f2624d5d625716ca3767cd3c3a63':
Support asm/sockios.h for MIPS.
2012-08-22 16:51:01 -07:00
Andrew Hsieh
51f72cc1bd
Merge "Support asm/sockios.h for MIPS."
2012-08-22 16:38:02 -07:00
Roman Nurik
e7df2e3f6e
am f6457d05: Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev
...
* commit 'f6457d0548f499f77c996d13cc43115e448aa437':
Retroactively add EffectiveNavigation and TabCompat sample code.
2012-08-22 16:21:36 -07:00
Chao-Ying Fu
4cad8d6fdf
Support asm/sockios.h for MIPS.
...
Change-Id: I5ae75b0a8c2ff5698ca46f02bb371e710fb1fee0
2012-08-22 13:37:26 -07:00
Roman Nurik
f6457d0548
Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev
2012-08-22 11:50:43 -07:00
Roman Nurik
d80ee02011
Retroactively add EffectiveNavigation and TabCompat sample code.
...
This sample code was launched with the Implementing Effective Navigation and
Creating Backward-Compatible UIs training classes, but the source was never
added to AOSP. This retroactively adds the source, unmodified.
Change-Id: If6face5a0548107f7fd273e466b1ced2790f4f3a
2012-08-22 08:05:28 -07:00
Andrew Hsieh
c80c3a8fd8
am 17f2af7e: am a2b32b34: Merge "Update malloc.h"
...
* commit '17f2af7e1f08440814ade84898f6506e15fea15c':
Update malloc.h
2012-08-22 01:21:14 -07:00
Andrew Hsieh
17f2af7e1f
am a2b32b34: Merge "Update malloc.h"
...
* commit 'a2b32b34220a1bdea566502da1e3254c90f62f16':
Update malloc.h
2012-08-22 01:19:57 -07:00
Andrew Hsieh
a2b32b3422
Merge "Update malloc.h"
2012-08-22 01:08:42 -07:00
Andrew Hsieh
68d8ac7ce5
am ad00822f: am 581a749f: Merge "Support getrlimit and setrlimit for MIPS."
...
* commit 'ad00822fd4b907da9162c9c1497bebc534c95315':
Support getrlimit and setrlimit for MIPS.
2012-08-21 19:57:15 -07:00
Andrew Hsieh
9f4549c7db
am bfb39384: am 143949da: Merge "Add a .note.android.ident section to Android ELF binaries"
...
* commit 'bfb393846b99f4c5f7f3c5a661b64985cda39c78':
Add a .note.android.ident section to Android ELF binaries
2012-08-21 19:57:14 -07:00
Andrew Hsieh
ad00822fd4
am 581a749f: Merge "Support getrlimit and setrlimit for MIPS."
...
* commit '581a749fb1c313dcc3d80303bcc9e129e89fdec1':
Support getrlimit and setrlimit for MIPS.
2012-08-21 19:55:57 -07:00
Andrew Hsieh
bfb393846b
am 143949da: Merge "Add a .note.android.ident section to Android ELF binaries"
...
* commit '143949daba4c1f040753a9456a5e8d7e505e5045':
Add a .note.android.ident section to Android ELF binaries
2012-08-21 19:55:56 -07:00
Andrew Hsieh
581a749fb1
Merge "Support getrlimit and setrlimit for MIPS."
2012-08-21 19:48:50 -07:00
Andrew Hsieh
143949daba
Merge "Add a .note.android.ident section to Android ELF binaries"
2012-08-21 19:48:16 -07:00
Andrew Hsieh
d8326f3e34
am 6395d994: am d27250b2: Merge "Support poll for MIPS."
...
* commit '6395d9941e681ea4b1ebdd5a1d099ca6177c51bd':
Support poll for MIPS.
2012-08-21 17:31:46 -07:00