Commit Graph

13423 Commits

Author SHA1 Message Date
Andrew Hsieh
289d24e09a am fb7bcce6: Merge "Add back arc4random_stir for 32-bit android-L"
* commit 'fb7bcce68a2a1567410cfa0c800fe8568e037641':
  Add back arc4random_stir for 32-bit android-L
2014-09-08 02:42:12 +00:00
Andrew Hsieh
fb7bcce68a Merge "Add back arc4random_stir for 32-bit android-L" 2014-09-08 02:33:44 +00:00
Andrew Hsieh
09532ff646 Add back arc4random_stir for 32-bit android-L
See bionic 5dea47221a116aa87b0c286230c944ed6b629636

Change-Id: Id7342a4ea6e21764869d1809a0f75d435baf8ac2
2014-09-04 12:57:06 -07:00
Andrew Hsieh
35086b3b8b am 45b3c498: Merge "Add required permission to sample code"
* commit '45b3c498c4bc78e9949fedd1dc4ce4fdb7cea340':
  Add required permission to sample code
2014-09-04 19:48:30 +00:00
Andrew Hsieh
45b3c498c4 Merge "Add required permission to sample code" 2014-09-04 19:40:40 +00:00
Marco Nelissen
f6d2ae9279 Add required permission to sample code
Bug: 15014196
Change-Id: I0edf8320e9eaa02031d564735c17c016d7e14fda
2014-09-04 11:21:03 -07:00
Andrew Hsieh
dfaca9ff76 am 61b90c04: Merge "Refresh 64-bit headers/libs (WW36)"
* commit '61b90c04ede2ddf741f43ff279c5684bfc95d634':
  Refresh 64-bit headers/libs (WW36)
2014-09-04 18:04:44 +00:00
Andrew Hsieh
61b90c04ed Merge "Refresh 64-bit headers/libs (WW36)" 2014-09-04 17:57:44 +00:00
Andrew Hsieh
a3dcb3f229 am 811fc430: Merge "Update android-L/include/android"
* commit '811fc430bbde6f67fe71c108ca9ad4d683cc9183':
  Update android-L/include/android
2014-09-04 17:46:07 +00:00
Andrew Hsieh
811fc430bb Merge "Update android-L/include/android" 2014-09-04 17:36:36 +00:00
Andrew Hsieh
3f53b6f2fe Refresh 64-bit headers/libs (WW36)
sync to lmp-dev/bionic 1e010d60397db706cd3d1c4d5701a2bced441aa8

Change-Id: Ieed39d41eb0655d7c8f027bd038be1753a9e56a6
2014-09-03 22:36:28 -07:00
Elliott Hughes
6b9a4ef217 am 72bd0479: Merge "Make \'stack\' able to find toolchains regardless of lunch."
* commit '72bd04795b38b8dbbbf5d4b6e8c5cac2a4322702':
  Make 'stack' able to find toolchains regardless of lunch.
2014-08-29 22:38:47 +00:00
Elliott Hughes
72bd04795b Merge "Make 'stack' able to find toolchains regardless of lunch." 2014-08-29 22:29:43 +00:00
Elliott Hughes
c3c8619579 Make 'stack' able to find toolchains regardless of lunch.
This is needed by the internal stack decoding website, which
will be pulling symbols from the build servers anyway (so doesn't
need to be correctly lunched).

Bug: 16734486
Change-Id: I9190065148c0d4bb4eacec28bcc062fa95798917
2014-08-29 13:49:57 -07:00
Andrew Hsieh
c7f04c38a0 Update android-L/include/android
Added more constants, and 6 new sensor functions

Change-Id: I0b8a028ec948ba66074e949bc20435cb05845a80
2014-08-28 14:29:28 +08:00
Leandro Gracia Gil
c32e908139 am 4123e088: Merge "Add the protobuf compiler binary to the Windows SDK build."
* commit '4123e0886b69fd7ecb91abe1c4ac9bfca1de52e7':
  Add the protobuf compiler binary to the Windows SDK build.
2014-08-26 19:09:34 +00:00
Leandro Gracia Gil
4123e0886b Merge "Add the protobuf compiler binary to the Windows SDK build." 2014-08-26 18:53:23 +00:00
Stephen Hines
9cad766918 am 6d884d6c: Merge "Fix RS samples to prepare for 64-bit compilation."
* commit '6d884d6cb304e14e380ba501abe868cfaea97426':
  Fix RS samples to prepare for 64-bit compilation.
2014-08-22 23:58:35 +00:00
Stephen Hines
6d884d6cb3 Merge "Fix RS samples to prepare for 64-bit compilation." 2014-08-22 23:27:39 +00:00
Stephen Hines
73ae6d9f02 Fix RS samples to prepare for 64-bit compilation.
Bug: 16031597
Change-Id: I8f79773e4d5219d3c8dc4696176cd42f8236c87b
(cherry picked from commit d8295c9e49)
2014-08-22 01:16:21 -07:00
Ying Wang
67f00d4487 am 7ec230ea: Merge "Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree."
* commit '7ec230eaf2a35e98bdb28da92feecf7476eb0a33':
  Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.
2014-08-19 17:01:50 +00:00
Ying Wang
7ec230eaf2 Merge "Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree." 2014-08-19 15:49:56 +00:00
Ying Wang
00b44e517b Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.
Bug: 17105204
Change-Id: I80dcad8198926dd0b758d65bd8704eb4c6b39e8d
2014-08-19 09:33:45 -07:00
Andrew Hsieh
5ece62409b am 348e3402: Merge "Refresh 64-bit headers/libs (WW31)"
* commit '348e3402458a9783a151f71409c7e0e3ead12aaa':
  Refresh 64-bit headers/libs (WW31)
2014-08-04 03:06:48 +00:00
Andrew Hsieh
348e340245 Merge "Refresh 64-bit headers/libs (WW31)" 2014-08-01 15:55:34 +00:00
Kenny Root
2d37bfefed am 9ce4e448: Merge "make_key: reduce raciness of password input"
* commit '9ce4e448dc69cf2d3ebdcdb56956b3f685f99182':
  make_key: reduce raciness of password input
2014-07-31 23:11:58 +00:00
Kenny Root
9ce4e448dc Merge "make_key: reduce raciness of password input" 2014-07-31 19:45:30 +00:00
Kenny Root
7f3f83e0e3 make_key: reduce raciness of password input
Bug: 14595245
Change-Id: I8a9e4f2c46aa3c85763975c5cb7a47df197f7746
2014-07-31 13:00:12 -07:00
Andrew Hsieh
b4ddea108f Refresh 64-bit headers/libs (WW31)
Change-Id: If08781ae4ca14710a95d6bd0bd61477e0a472293
2014-07-30 14:18:12 +08:00
Leandro Gracia Gil
653fe8eb04 Add the protobuf compiler binary to the Windows SDK build.
Change-Id: I0acca9fc39b8b5528a1ca4bf25b0bacb32b515e2
2014-07-28 15:25:41 -07:00
Andrew Hsieh
c59b1400fd am 0efeb2c6: Merge "Fix the name of the native app glue lib in a header comment"
* commit '0efeb2c66bff9b36feecd9315d14d2afb46e4669':
  Fix the name of the native app glue lib in a header comment
2014-07-28 02:12:07 +00:00
Andrew Hsieh
0efeb2c66b Merge "Fix the name of the native app glue lib in a header comment" 2014-07-25 11:19:19 +00:00
Martin Storsjo
4ff22dcdcb Fix the name of the native app glue lib in a header comment
The incorrect name is misleading and confusing.

Change-Id: I4040d7bc10370c440401dd9de7e1fc472830287a
2014-07-27 22:15:58 +03:00
Andrew Hsieh
093774e6e6 am b50f8f66: Merge "Add APP_ABI for module-exports sample"
* commit 'b50f8f6612c74ad78194555e8a3d5a3441eedf02':
  Add APP_ABI for module-exports sample
2014-07-21 13:06:32 +00:00
Andrew Hsieh
41c211692c am 30c2909f: Merge "Refresh 64-bit headers/libs (WW29)"
* commit '30c2909f512939f3cb51cc9682bca3235299e149':
  Refresh 64-bit headers/libs (WW29)
2014-07-21 10:35:44 +00:00
Andrew Hsieh
8e1ad1c94d am fa902f33: Merge "Fix gl3stub.h"
* commit 'fa902f33442e0a2c35edd6b84638009f491350ac':
  Fix gl3stub.h
2014-07-21 10:35:43 +00:00
Yohann Roussel
96489645ab am e15f6511: Merge "Move multidex support library"
* commit 'e15f6511b7a86622dbc63392830ecd61df4da6e0':
  Move multidex support library
2014-07-18 10:55:29 +00:00
Yohann Roussel
a7aa5e0e86 am 2d2ce1b6: Merge "Add res folder to multidex SDK projects."
* commit '2d2ce1b6c3d8dc221ac783103b116ce8dcdfd7e2':
  Add res folder to multidex SDK projects.
2014-07-18 10:55:27 +00:00
Yohann Roussel
8a8f24886d am 93b72e47: Merge "android-support-multidex-instrumentation in SDK."
* commit '93b72e4703204b1ba15929a9b30e5b2ec3febfa5':
  android-support-multidex-instrumentation in SDK.
2014-07-18 10:55:26 +00:00
Yohann Roussel
b8db294e23 am c854c636: Merge "Add multidex ADT project to SDK."
* commit 'c854c636d9396cc412dd2efdb69eae8ae22969fa':
  Add multidex ADT project to SDK.
2014-07-18 10:55:25 +00:00
Yohann Roussel
7ec33a7cf3 am 0d1b03f1: Merge "Include android-support-multidex in SDK libs."
* commit '0d1b03f127ff2fd0b6a6d79dbf76c6ab8debb527':
  Include android-support-multidex in SDK libs.
2014-07-18 10:55:24 +00:00
Andrew Hsieh
fa902f3344 Merge "Fix gl3stub.h" 2014-07-17 23:12:27 +00:00
Andrew Hsieh
b50f8f6612 Merge "Add APP_ABI for module-exports sample" 2014-07-17 22:52:20 +00:00
Arseniy Antonov
22359ed8bf Add APP_ABI for module-exports sample
Add APP_ABI := all
to be able to compile this sample for all platforms
without additional manual manipulations.

Change-Id: I8ebb98c86dae2f6e926885b6d70d306ceca33d1f
Signed-off-by: Arseniy Antonov <arseniy.antonov@intel.com>
2014-07-21 16:51:46 +04:00
Andrew Hsieh
30c2909f51 Merge "Refresh 64-bit headers/libs (WW29)" 2014-07-17 22:52:20 +00:00
Andrew Hsieh
cc101e0860 Refresh 64-bit headers/libs (WW29)
Change-Id: Ifaee25e70db14327c6f8104b04bf3abd71493477
2014-07-19 16:03:48 +08:00
Yohann Roussel
e15f6511b7 Merge "Move multidex support library" 2014-07-17 22:39:21 +00:00
Maurice Chu
6fee567b2f Move multidex support library
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.

Bug: 10674263

(cherry picked from commit 7b433ee4e4)

Change-Id: If33387af7b58da2f258eba1240a911483daa9c7e
2014-07-18 10:52:54 +00:00
Yohann Roussel
2d2ce1b6c3 Merge "Add res folder to multidex SDK projects." 2014-07-17 22:37:43 +00:00
Yohann Roussel
c854c636d9 Merge "Add multidex ADT project to SDK." 2014-07-17 22:37:43 +00:00