Raphael Moll
f786331925
am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master
...
* commit '261307bebe8986599055bb97d5587977c8da53eb':
Fix SDK build.
2014-05-20 23:35:46 +00:00
Raphael Moll
261307bebe
resolved conflicts for merge of bf164835 to stage-aosp-master
...
Change-Id: I3c380b1ddae5e088985513398d7eb6274d8426eb
2014-05-20 16:29:29 -07:00
Raphael Moll
bf164835e6
Merge "Fix SDK build."
2014-05-20 21:12:26 +00:00
Raphael Moll
e9a7920ca4
Fix SDK build.
...
development's sdk.atree depends on the generated file
/sdk/files/sdk_files_NOTICE.txt which was accumulating
all the tools notices.
However this file isn't generated anymore.
This replaces it by a static file.
This is only good as a temporary measure to fix the build.
The proper fix is to recreate the SDK rule to generate the
combined NOTICE.txt and move it in development.git
Change-Id: I27e4f38e756b81b002d16dfac5ccaa54a4463786
2014-05-20 14:10:47 -07:00
Andrew Hsieh
9d0a4a6eca
am 5f3ed7dd: am 80bc4f93: Merge "Refresh 64-bit headers/libs (WW20)"
...
* commit '5f3ed7ddd0b3708baadf5ce357c74e331c16f986':
Refresh 64-bit headers/libs (WW20)
2014-05-19 01:29:21 +00:00
Andrew Hsieh
5f3ed7ddd0
am 80bc4f93: Merge "Refresh 64-bit headers/libs (WW20)"
...
* commit '80bc4f931edb0c56473ba89a132e56ac99995420':
Refresh 64-bit headers/libs (WW20)
2014-05-19 01:26:02 +00:00
Andrew Hsieh
80bc4f931e
Merge "Refresh 64-bit headers/libs (WW20)"
2014-05-19 01:21:47 +00:00
Chet Haase
98253982ea
am 3b3ab0e0: Add demo for animating RecyclerView actions
...
* commit '3b3ab0e040ecbeee2f916b969b1044a2b9e222bd':
Add demo for animating RecyclerView actions
2014-05-17 16:00:45 +00:00
Chet Haase
3b3ab0e040
Add demo for animating RecyclerView actions
...
Change-Id: Ie076db6646cf734706fe2ea8659ee57f3a7742e9
2014-05-17 15:21:44 +00:00
Andrew Hsieh
2c91491806
Refresh 64-bit headers/libs (WW20)
...
Change-Id: I91c4a89635a075d2264e43c51f56b70fe999152f
2014-05-17 06:37:26 +08:00
Raphael Moll
7401fa161f
am 8aa49aef: am f9f829e5: Merge "SDK: support generating repository XML with latest XSD."
...
* commit '8aa49aef8adb24a1b977d89b60a48a781e4e6674':
SDK: support generating repository XML with latest XSD.
2014-05-16 20:12:42 +00:00
Raphael Moll
8aa49aef8a
am f9f829e5: Merge "SDK: support generating repository XML with latest XSD."
...
* commit 'f9f829e51afe3906458a81cb4efb75a051c64c04':
SDK: support generating repository XML with latest XSD.
2014-05-16 20:09:40 +00:00
Raphael Moll
f9f829e51a
Merge "SDK: support generating repository XML with latest XSD."
2014-05-16 20:05:47 +00:00
Andrew Hsieh
e21f842a03
am 44e42e61: am 67dc50cb: Merge changes Ie67acf11,Ia9c03558
...
* commit '44e42e61ab33b2dc094729a2bd24d7eba5ddbecc':
Remove non-existanec functions/variables from libc.so
Restore stdint.h for android-3..19 to the original headers
2014-05-16 03:22:16 +00:00
Andrew Hsieh
908d100eff
am fa00a604: am abc6d891: Merge "Update lib-boostrape for 64-bit libraries built with GCC toolchain"
...
* commit 'fa00a60465f3f712193ee062b13be5f79b5d1ba9':
Update lib-boostrape for 64-bit libraries built with GCC toolchain
2014-05-16 03:22:15 +00:00
Andrew Hsieh
44e42e61ab
am 67dc50cb: Merge changes Ie67acf11,Ia9c03558
...
* commit '67dc50cbbbf5d3cf873495d4d5ae1e67f29ffe9e':
Remove non-existanec functions/variables from libc.so
Restore stdint.h for android-3..19 to the original headers
2014-05-16 03:18:38 +00:00
Andrew Hsieh
fa00a60465
am abc6d891: Merge "Update lib-boostrape for 64-bit libraries built with GCC toolchain"
...
* commit 'abc6d891a037e33fe70cc24a032efa58a10d16fa':
Update lib-boostrape for 64-bit libraries built with GCC toolchain
2014-05-16 03:18:36 +00:00
Andrew Hsieh
67dc50cbbb
Merge changes Ie67acf11,Ia9c03558
...
* changes:
Remove non-existanec functions/variables from libc.so
Restore stdint.h for android-3..19 to the original headers
2014-05-16 03:17:19 +00:00
Andrew Hsieh
abc6d891a0
Merge "Update lib-boostrape for 64-bit libraries built with GCC toolchain"
2014-05-16 03:16:21 +00:00
Raphael Moll
ea40d2f4c5
SDK: support generating repository XML with latest XSD.
...
The latest version of the repository XSD changes:
- archive attributes (os/arch) are now element (host-os)
- system images are not longer in the repository.xml and
get their own XML file.
Change-Id: If5820a84d5c754b816b17b5713bbdb2597736eff
2014-05-15 17:49:02 -07:00
Andrew Hsieh
0810f8a6ec
am 7e3d050a: am 2f35f1fa: Merge "Update android-20 wchar.h up to bionic state."
...
* commit '7e3d050add2d534b6e48353362cf7598f5f8f3f7':
Update android-20 wchar.h up to bionic state.
2014-05-16 00:34:09 +00:00
Andrew Hsieh
7e3d050add
am 2f35f1fa: Merge "Update android-20 wchar.h up to bionic state."
...
* commit '2f35f1fa51db20695be65668986e44dd80da9616':
Update android-20 wchar.h up to bionic state.
2014-05-16 00:30:21 +00:00
Andrew Hsieh
2f35f1fa51
Merge "Update android-20 wchar.h up to bionic state."
2014-05-16 00:27:28 +00:00
Arseniy Antonov
4e1ef36772
Update android-20 wchar.h up to bionic state.
...
Corresponding changes in bionic:
Ia9bd0785bc42c7b46e2bb6c3d9b9a9d3f769d983
I5abdc7cc3c27c109b7900c94b112f18a95c35763
Change-Id: Ie86fd15226fe552b6f0e60c24debbe1d79f7a332
Signed-off-by: Arseniy Antonov <arseniy.antonov@intel.com >
2014-05-15 18:48:19 +04:00
Andrew Hsieh
3dc9183a69
am 2ec7a5c0: am a5afedd2: Merge "Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build"
...
* commit '2ec7a5c0f679a0d1e83ebc55479d1b8bbcb79f7d':
Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build
2014-05-15 11:07:26 +00:00
Andrew Hsieh
2ec7a5c0f6
am a5afedd2: Merge "Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build"
...
* commit 'a5afedd2e21846f8cd8d662c4a7ef7ec3dc6dfee':
Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build
2014-05-15 11:03:55 +00:00
Andrew Hsieh
a5afedd2e2
Merge "Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build"
2014-05-15 11:01:00 +00:00
Chet Haase
b360b2e8c1
am abbe7bd1: Revert "Add demo for animating RecyclerView actions"
...
* commit 'abbe7bd1e0f7ecc64a9f542b8d0eb78de7e567fe':
Revert "Add demo for animating RecyclerView actions"
2014-05-15 00:17:26 +00:00
Chet Haase
abbe7bd1e0
Revert "Add demo for animating RecyclerView actions"
...
This reverts commit 828b2aa2f4 .
Change-Id: I0f773b5c42530cad924e454dc816ddc372db95f7
2014-05-15 00:01:07 +00:00
Chet Haase
ff3d094e86
am 828b2aa2: Add demo for animating RecyclerView actions
...
* commit '828b2aa2f42b0e079e05c560e749835bef3ef71f':
Add demo for animating RecyclerView actions
2014-05-14 21:06:07 +00:00
Chet Haase
828b2aa2f4
Add demo for animating RecyclerView actions
...
Change-Id: Ieb14cfb627663f507c24205d697347a1da389094
2014-05-14 14:01:18 -07:00
David 'Digit' Turner
a9206776fe
am 3907ebb7: am 94ebf1e6: Merge "libportable: Add dependency on libdl."
...
* commit '3907ebb75e450b02f6996f6fa368ca0d2bacfb4a':
libportable: Add dependency on libdl.
2014-05-12 13:36:05 +00:00
David 'Digit' Turner
3907ebb75e
am 94ebf1e6: Merge "libportable: Add dependency on libdl."
...
* commit '94ebf1e6a993391f8139e4ee4702c02bdda560a9':
libportable: Add dependency on libdl.
2014-05-12 13:31:55 +00:00
David 'Digit' Turner
94ebf1e6a9
Merge "libportable: Add dependency on libdl."
2014-05-12 13:28:34 +00:00
David 'Digit' Turner
e398009921
libportable: Add dependency on libdl.
...
The patch at [1] was reverted because ndk/sources/android/cpu-features
is now part of the platform build (as a dependency of libportable), and
now requires dlopen()/dlsym()/dlclose().
Because the platform build system doesn't support LOCAL_EXPORT_LDLIBS,
add the dependency to libportable's own module definition instead.
After this patch is submitted, it's possible to re-apply the original
patch and get a working build.
[1] https://android-review.googlesource.com/#/c/91380/
BUG=13679666
Change-Id: I54b4376a562242d21631eaf13090650decfe791d
2014-05-12 15:10:01 +02:00
Andrew Hsieh
1e61663835
Remove non-existanec functions/variables from libc.so
...
See b.android.com/69319
android-9+
__evOptMonoTime
_nres
__p_default_section_syms
__p_update_section_syms
_rand48_add
_rand48_mult
_rand48_seed
_res_opcodes
__sFext
android-12+
copy_tm_to_TM
copy_TM_to_tm
__dtoa
_endhtent
__fremovelock
_gethtbyaddr
_gethtbyname
_gethtbyname2
_gethtent
__libc_android_abort
_mktemp # mktemp already exist in header
__pread64 # add pread64, pwrite64 and ftruncate64 to API >= 12
__pwrite64
res_need_init
__res_ourserver_p
_sethtent
__set_syscall_errno
__sfvwrite
__timer_table_start_stop
valid_tm_mon
valid_tm_wday
android-14+
__libc_android_log_assert
__libc_android_log_print
__libc_android_log_vprint
android-17+
dlmalloc_walk_free_pages
dlmalloc_walk_heap
__get_pc
android-18+
__get_res_cache
__libc_init_common
__libc_preinit
Change-Id: Ie67acf115427e808dde0e33411671b07a888a9b6
2014-05-12 19:22:17 +08:00
Andrew Hsieh
106c0c694c
am 3d34e652: am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist."
...
* commit '3d34e6524e035c6f55cac6553c73c7b18f9910c3':
Add libcxx projects and compiler-rt to windows whitelist.
2014-05-12 10:30:32 +00:00
Andrew Hsieh
3d34e6524e
am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist."
...
* commit '7b004d960657c15145ce1272f7a61c8ca4272cd1':
Add libcxx projects and compiler-rt to windows whitelist.
2014-05-12 10:27:46 +00:00
Andrew Hsieh
7b004d9606
Merge "Add libcxx projects and compiler-rt to windows whitelist."
2014-05-12 10:23:36 +00:00
Andrew Hsieh
7986b0872e
Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build
...
Fixes two issues:
1. Remove redundant check for hard-float in Teapot/MoreTeapots and ndk_helper
they depend. The ndk-build system add those flags already for armeabi-v7a-hard
2. native-audio in debug build: assert on the non-existance var
Change-Id: Id6b2d38a264c2f2d0e0c7fe625991fcee1762800
2014-05-12 15:53:37 +08:00
Andrew Hsieh
154e19fda6
Restore stdint.h for android-3..19 to the original headers
...
$NDK/tests/standalone/run.sh fail to run with last update on stdint.h
to android-20 level. Restore stdint.h for fear of the new one breaking
the existing apps
Also fix signal_portable.h to use SIGRTMIN/MAX in old headers
(which got renamed to __SIGRTMIN in new header)
Also change _JBLEN to 1024 which shall be large enough to store CPU
states for forseable future.
Change-Id: Ia9c03558a258c10434eb8e6985adc122532feaa3
2014-05-12 12:14:33 +08:00
Andrew Hsieh
b1111100fc
Update lib-boostrape for 64-bit libraries built with GCC toolchain
...
Change-Id: Icdc4bf924f660eb137e70ad80c91f68efd30824f
2014-05-12 12:04:58 +08:00
Andrew Hsieh
c78fab9f39
am 829367fd: am 46452519: Merge "Refresh android-20 headers/libs"
...
* commit '829367fdb42839e1c1e7bd8ce25206048d8e0a2f':
Refresh android-20 headers/libs
2014-05-12 03:58:05 +00:00
Andrew Hsieh
829367fdb4
am 46452519: Merge "Refresh android-20 headers/libs"
...
* commit '4645251978aaa9e9db0501efb03f56432a1b9b85':
Refresh android-20 headers/libs
2014-05-12 03:53:30 +00:00
Andrew Hsieh
4645251978
Merge "Refresh android-20 headers/libs"
2014-05-12 03:47:32 +00:00
Stephen Hines
d7d603fbbb
Add libcxx projects and compiler-rt to windows whitelist.
...
Change-Id: I2d6189b4e9a0440330d1212dae9396b88b66ea3f
2014-05-09 14:45:58 -07:00
Andrew Hsieh
f81cdeba6a
Refresh android-20 headers/libs
...
bionic: adfc007dbf936bd021d79ba2d2c360a3cfc77be9 5/19 2014
Change-Id: I4836f04d9b5b68abe7896e246c9dffa2e175e4ca
2014-05-09 20:08:02 +08:00
Andrew Hsieh
870c6634cc
am 557c79bf: am b769dcb8: Merge "Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN"
...
* commit '557c79bf9fc30d9978af67db04604fd035d90f97':
Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN
2014-05-09 02:48:27 +00:00
Andrew Hsieh
557c79bf9f
am b769dcb8: Merge "Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN"
...
* commit 'b769dcb815594fc1407d58c7d1e10f72a48aa196':
Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN
2014-05-09 02:43:24 +00:00
Andrew Hsieh
b769dcb815
Merge "Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN"
2014-05-09 02:38:01 +00:00