Commit Graph

14510 Commits

Author SHA1 Message Date
Ian Ni-Lewis
b0ccced623 am e79e1d42: am 00b7cabe: Merge "cleaned code, added pinch gesture detector, better opengl context handling, fixed issues"
* commit 'e79e1d42ac7be5e64d2d3265bbb3d8f31a614a2c':
2014-05-13 15:15:54 +00:00
Elliott Hughes
8ce5393ee7 am 1142d35b: am 1a062a25: am 00d5277a: am 9c527023: am 122d194b: Merge "Fix incorrect extern declaration of poll(2)."
* commit '1142d35b032a077d58edb629571513acacadaff0':
2014-05-13 15:15:51 +00:00
Narayan Kamath
408d183c96 am 533a83f6: am e38dba60: am e53bc4d9: am 80b5d8d2: am b4f054a8: Merge "Remove invalid UTF-8 chars from source."
* commit '533a83f6b6e76e8c3cc2c3e11bac1d3631ff7d47':
2014-05-13 15:15:48 +00:00
Ben Murdoch
1072747ce0 am 37a0f4ed: am 489c3b6b: Merge "Add mips support to stack tool."
* commit '37a0f4ed6616f92b1be7ecc906bb1c8b13e7dbe4':
2014-05-13 15:15:47 +00:00
Tor Norbye
779381999c am 499f96a5: am 98fd3b44: am 8c37790e: am 15a65401: Update the api-version.xml file to reflect KitKat recent changes
* commit '499f96a5e3a5085f6c62a85733cd2e5e800fff33':
2014-05-13 15:15:46 +00:00
Chet Haase
6f8533c207 am 37c4ea46: am a1a8337f: am f02d4487: am 9262e703: Merge "Fix ApiDemo for transitions" into klp-dev
* commit '37c4ea4637cd62f7bc27efb16526a4fa457084fe':
2014-05-13 15:15:44 +00:00
Adam Koch
4a296a447a am 94ebdc8f: am b184cdd9: am fb159c79: am 7165109e: Bitmapfun Sample: Cleanup gradle files to import into Studio properly.
* commit '94ebdc8fafcef323870f03f5a63c83f5743bf6ab':
2014-05-13 15:15:40 +00:00
Chong Zhang
3584f2b768 am 03beab7e: am 9d0982d5: am 2e2085f4: am 2ec448a2: am 58ef2c38: am fd6d06a1: mrp sample: refactor and use helper class
* commit '03beab7e9508de617cf7c35c4f32047cf779fc44':
2014-05-13 15:15:38 +00:00
Jeff Brown
ba9ddd7f4a am b133e0e6: am 65f5b5bb: am c683fb4c: am bb1f4a73: am 10f22587: am 6a81c4be: Fix NPE in sample code.
* commit 'b133e0e6321fcfc10c26573b2ed07d225e79db58':
2014-05-13 15:15:37 +00:00
Adam Koch
93643bc6e5 am 0ec39f3d: am c352e57b: am 0d873095: am 933dd8a3: Merge "Bitmapfun Sample: Update for KitKat and clean up some minor bugs." into klp-dev
* commit '0ec39f3d8027b4acac6405a0d1683510b1fd98c6':
2014-05-13 15:15:35 +00:00
Adam Koch
f732e842db am f224cd4c: am ad76f956: am 107a3b94: am c246e4a8: Merge "Bitmapfun Sample: Migrate to Android Studio/gradle project." into klp-dev
* commit 'f224cd4cc7198a3924fff71c4d2ad07e6d0fd3ff':
2014-05-13 15:15:34 +00:00
Ben Cheng
a82f844560 am b1d6d2e4: am f85cfcfe: am c888278c: am d4b49c6c: am 8edf8ef6: Merge "Refresh sysroot headers for aarch64."
* commit 'b1d6d2e4801fe468b45f9b081cb908ac62a63365':
2014-05-13 15:15:32 +00:00
Tor Norbye
af0c4e80a2 am 1163d57b: am 68370aef: am 03a66dd8: am 30278c6f: Merge "Update the api-version.xml file to reflect KitKat recent changes" into klp-dev
* commit '1163d57b5de1b7807d02c0e1227b11e51c6c6b1b':
2014-05-13 15:15:31 +00:00
The Android Automerger
6486e56f58 merge in master-release history after reset to 72a0c45934 2014-05-13 05:49:35 -07:00
Evan Charlton
a69f916a8b resolved conflicts for merge of a706c744 to master-nova
Change-Id: I18498f7319dbe7ce8a52bb87106339c4046ac2c9
2014-05-12 17:19:20 -07:00
George Mount
fb8e37e754 Changed sharedElementName to viewName.
Bug 14624181

Change-Id: Ia822e252030d94c0b73f41914656985656bc5efa
2014-05-12 11:50:35 -07:00
David 'Digit' Turner
0ea35ab789 am 72a0c459: am a9206776: am 3907ebb7: am 94ebf1e6: Merge "libportable: Add dependency on libdl."
* commit '72a0c459345ca68dd062b7f50e50676452db3ce9':
  libportable: Add dependency on libdl.
2014-05-12 13:45:10 +00:00
David 'Digit' Turner
72a0c45934 am a9206776: am 3907ebb7: am 94ebf1e6: Merge "libportable: Add dependency on libdl."
* commit 'a9206776feed51f027ad9e6dac31b7dc2e5f86cf':
  libportable: Add dependency on libdl.
2014-05-12 13:38:41 +00: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
The Android Automerger
1ea8849563 merge in master-release history after reset to be9d36572c 2014-05-12 05:49:22 -07: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
8b9b37cec2 am be9d3657: am 106c0c69: am 3d34e652: am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist."
* commit 'be9d36572c0c7669d4e113844db78078d8d67d1e':
  Add libcxx projects and compiler-rt to windows whitelist.
2014-05-12 10:38:20 +00:00
Andrew Hsieh
be9d36572c am 106c0c69: am 3d34e652: am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist."
* commit '106c0c694c9818fd45fee7afa0af33b25407fb25':
  Add libcxx projects and compiler-rt to windows whitelist.
2014-05-12 10:34:52 +00: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
1ef9539af9 am 8433215b: am c78fab9f: am 829367fd: am 46452519: Merge "Refresh android-20 headers/libs"
* commit '8433215b56faef843fd24e9e38b929000bc7df12':
  Refresh android-20 headers/libs
2014-05-12 04:05:50 +00: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
8433215b56 am c78fab9f: am 829367fd: am 46452519: Merge "Refresh android-20 headers/libs"
* commit 'c78fab9f39dd7ac8c0649de6fb5b7f251a4c34f2':
  Refresh android-20 headers/libs
2014-05-12 04:01:48 +00: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
The Android Automerger
a6d61c6cec merge in master-release history after reset to 116bf16d1f 2014-05-11 05:49:18 -07:00
The Android Automerger
bc9d5d1c51 merge in master-release history after reset to 116bf16d1f 2014-05-10 05:49:35 -07: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
1c8a5c9b3a am 116bf16d: am 870c6634: am 557c79bf: am b769dcb8: Merge "Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN"
* commit '116bf16d1f822c264573662031ed9be4ba49a9da':
  Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN
2014-05-09 02:57:34 +00:00
Andrew Hsieh
116bf16d1f am 870c6634: am 557c79bf: am b769dcb8: Merge "Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN"
* commit '870c6634cce1ec436b541d3023c318d5a9fd5013':
  Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN
2014-05-09 02:52:48 +00: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
Xavier Ducrohet
f1018d2a2f am 580b1703: am 6ee534bf: am 557639cf: am 2567045c: Merge "Remove SDK tools from build."
* commit '580b17036487c0087737431facf9d5d42fd1b3d2':
  Remove SDK tools from build.
2014-05-09 01:05:31 +00:00
Xavier Ducrohet
580b170364 am 6ee534bf: am 557639cf: am 2567045c: Merge "Remove SDK tools from build."
* commit '6ee534bf5d492e61e03fa863ddfb2142131cad9f':
  Remove SDK tools from build.
2014-05-09 00:59:58 +00:00
Xavier Ducrohet
6ee534bf5d am 557639cf: am 2567045c: Merge "Remove SDK tools from build."
* commit '557639cf1167a32c9601a53fd70af7eb81413556':
  Remove SDK tools from build.
2014-05-09 00:56:45 +00:00
Xavier Ducrohet
557639cf11 am 2567045c: Merge "Remove SDK tools from build."
* commit '2567045c07dfae87fa53dfdc349681b5311d3522':
  Remove SDK tools from build.
2014-05-09 00:52:33 +00:00