LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,822 Commits 2 Branches 0 Tags
ca34f82c99136a78fc328cdd596d0552fda1636c
Commit Graph

15822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Yohann Roussel
93b72e4703 Merge "android-support-multidex-instrumentation in SDK." 2014-07-17 22:36:58 +00:00
Yohann Roussel
0d1b03f127 Merge "Include android-support-multidex in SDK libs." 2014-07-17 22:36:58 +00:00
Sungsoo Lim
51324e22d1 Merge "Remove the dummy implementation of onContentUnblocked()" into lmp-dev 2014-07-17 22:03:23 +00:00
Sungsoo Lim
e88684d024 Remove the dummy implementation of onContentUnblocked() 
This reverts commit 3b0abb7811.

Change-Id: I784cdd5ce0fe78ba66ed5e8cb8135b9082b4aa1c
 2014-07-19 04:52:42 +00:00
Chulwoo Lee
9f688cc161 Merge "Put input ID when inserting channels" into lmp-dev 2014-07-17 22:03:23 +00:00
Chulwoo Lee
f96eb6672e Put input ID when inserting channels 
Change-Id: I1c9944db6fd9d05cfbbfffe2e3464b6f16b7445b
 2014-07-18 18:27:30 +09:00
Wonsik Kim
859cc5f0e6 Merge "Adjust to onCreateSession() method signature change" into lmp-dev 2014-07-17 22:03:23 +00:00
Wonsik Kim
e7713aa686 Adjust to onCreateSession() method signature change 
Change-Id: I6137f2d85eb2ca18fb3e50bac54f048470145cd5
 2014-07-18 13:10:02 +09:00
Ying Wang
90b2bdae91 Merge "3rd attempt to build and store android_system.jar in sdk builds." into lmp-dev 2014-07-17 21:58:28 +00:00
Ying Wang
567a46bf22 3rd attempt to build and store android_system.jar in sdk builds. 
Change-Id: Ica053e3ef6e3190ab4dcc32b3b7d06fc4c619884
 2014-07-18 09:16:40 -07:00
Jae Seo
66ef0f3c8a am d85449be: Quick build fix 
* commit 'd85449be2418d23c36c984a4ebe3970f9f30208b':
  Quick build fix
 2014-07-17 21:29:53 +00:00
Deepanshu Gupta
82b828e178 Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev 2014-07-17 21:09:48 +00:00
Jae Seo
d85449be24 Quick build fix 
Change-Id: I7b660363a53b77249c6ac94a78f25c70b449d0fc
 2014-07-17 13:16:48 -07:00
Yigit Boyar
850c44e0ec Merge "Update divider item decorator to account for view translation" into lmp-dev 2014-07-17 17:59:02 +00:00
Yigit Boyar
cc33d7ec0f Update divider item decorator to account for view translation 
Bug: 16241985
Change-Id: Id441a07fe547493007e9e05d1039bac526847a1c
 2014-07-17 16:37:21 -07:00
Ying Wang
38bf922ac1 Merge ""sdk" is not necessarily on the linux command line." into lmp-dev 2014-07-17 17:59:02 +00:00
Ying Wang
c39b6ebb2f "sdk" is not necessarily on the linux command line. 
Bug: 16208466
Change-Id: I29f8763e9763d2b482744d0c7a74c122a299d03b
 2014-07-17 21:18:09 -07:00
Jim Miller
44f8eb157b am 94a862f0: Add new "pin complex" type to supported keyguard PINs 
* commit '94a862f010399b46e38178e325f9e0da00c12ef8':
  Add new "pin complex" type to supported keyguard PINs
 2014-07-17 17:01:37 +00:00
Yohann Roussel
b16fd5a5f4 Add res folder to multidex SDK projects. 
This will fix an error when importing thoses projects with ADT.

(cherry picked from commit 6fa1156b3b)

Change-Id: Ibcd570a3f4f3bd6c8c4fd263d2d18e2cec18b787
 2014-07-17 16:44:30 +02:00
Yohann Roussel
ef0e4f5a3b Add multidex ADT project to SDK. 
(cherry picked from commit a6ca3cf29f)

Change-Id: I44cf397dbc5649d9d701e2f8524a322d74c2aaa6
 2014-07-17 16:44:30 +02:00
Yohann Roussel
96dc8db6e5 android-support-multidex-instrumentation in SDK. 
(cherry picked from commit 6f57b24889)

Change-Id: Ic8e609c0025d86c873161b28d99bb0da2b6c2d27
 2014-07-17 16:44:30 +02:00
Yohann Roussel
604bf1f185 Include android-support-multidex in SDK libs. 
(cherry picked from commit 9e27887b60)

Change-Id: Ieb2901a633a687927a0c5a5db6d17896c3b86449
 2014-07-17 16:44:30 +02:00
Andrew Hsieh
d54e91cf9b am a6b673cd: am 37feee2a: Merge "Update mipsel and mips64el multilib lib* and lib-bootstrap" 
* commit 'a6b673cd97ac0bdb28e041cff431167fc70e534d':
  Update mipsel and mips64el multilib lib* and lib-bootstrap
 2014-07-17 12:59:55 +00:00
Andrew Hsieh
dee2e870e6 am 430b78ad: am 37351fdd: Merge "Remove symlink ndk/platforms/android-L/arch-mips64/lib" 
* commit '430b78ad742811338c62394f74608322db6e7dec':
  Remove symlink ndk/platforms/android-L/arch-mips64/lib
 2014-07-17 12:59:54 +00:00
Andrew Hsieh
6bdc96770e am 61aaedb2: am 488f2392: Merge "getSampletime -> getSampleTime" 
* commit '61aaedb278afed833d19a51eeda23fa61e71d9f9':
  getSampletime -> getSampleTime
 2014-07-17 12:59:53 +00:00
Andrew Hsieh
7086c5c4a7 am b240fe6d: am 2918193e: Merge "Media NDK files" 
* commit 'b240fe6de0e2e61bb97a2569e583148b11e2d1d3':
  Media NDK files
 2014-07-17 12:59:52 +00:00
Andrew Hsieh
7cde60b29e am 37b64790: am 8092009a: Merge "NDK media codec sample" 
* commit '37b647901798727c01a9bbc5960060ec4880a47a':
  NDK media codec sample
 2014-07-17 12:59:50 +00:00
Andrew Hsieh
61e5e463f5 am b74edf6b: am 6fdc2791: Merge "ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so" 
* commit 'b74edf6b28ce6b852f0938f751f5b7331079e2eb':
  ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
 2014-07-17 12:59:49 +00:00
Andrew Hsieh
2cd1f4cec3 am 2097b3b7: am 8839697e: Merge "Update OpenSLES_Android.h for API L" 
* commit '2097b3b7e705753d7d5737f04cd133b941e79486':
  Update OpenSLES_Android.h for API L
 2014-07-17 12:59:48 +00:00
Elliott Hughes
818b45f494 am 14a67c7e: am be5e8f72: Merge "Stack tool 32/64 bit compatibility fixes." 
* commit '14a67c7e703553eaf722514f7e2e6eda48922819':
  Stack tool 32/64 bit compatibility fixes.
 2014-07-17 12:59:04 +00:00
Andrew Hsieh
a6b673cd97 am 37feee2a: Merge "Update mipsel and mips64el multilib lib* and lib-bootstrap" 
* commit '37feee2abc4f975962fbfab4052834800669964e':
  Update mipsel and mips64el multilib lib* and lib-bootstrap
 2014-07-17 12:30:41 +00:00
Andrew Hsieh
430b78ad74 am 37351fdd: Merge "Remove symlink ndk/platforms/android-L/arch-mips64/lib" 
* commit '37351fdd10ba1f4aba08c6da661acb3188576fd2':
  Remove symlink ndk/platforms/android-L/arch-mips64/lib
 2014-07-17 12:30:40 +00:00
Andrew Hsieh
61aaedb278 am 488f2392: Merge "getSampletime -> getSampleTime" 
* commit '488f2392a55e426f63966f118bfbf46c3f850f35':
  getSampletime -> getSampleTime
 2014-07-17 12:30:39 +00:00
Andrew Hsieh
b240fe6de0 am 2918193e: Merge "Media NDK files" 
* commit '2918193e0b792e089a8373817f3f485a037eca2f':
  Media NDK files
 2014-07-17 12:30:38 +00:00
Andrew Hsieh
37b6479017 am 8092009a: Merge "NDK media codec sample" 
* commit '8092009a49c525f4fefd053cffac23cc665ba3ef':
  NDK media codec sample
 2014-07-17 12:30:37 +00:00
Andrew Hsieh
b74edf6b28 am 6fdc2791: Merge "ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so" 
* commit '6fdc2791028c283f2068fcc935fb7928374e19c1':
  ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
 2014-07-17 12:30:36 +00:00
Andrew Hsieh
2097b3b7e7 am 8839697e: Merge "Update OpenSLES_Android.h for API L" 
* commit '8839697e9cd8efb0c916fde9bbc292e552d21adf':
  Update OpenSLES_Android.h for API L
 2014-07-17 12:30:35 +00:00
Andrew Hsieh
36dea383df Fix gl3stub.h 
Only define the following before android-L (where new headers define
them already)

  typedef khronos_int64_t  GLint64;
  typedef khronos_uint64_t GLuint64;
  typedef struct __GLsync *GLsync;

Also define L to 9999 for crtbrand.c which needs it to be an integer

Change-Id: I9ed957d70b85cd1cdfeacf11f77203b39c93023d
 2014-07-17 16:32:05 +08:00
Andrew Hsieh
8092009a49 Merge "NDK media codec sample" 2014-07-17 04:16:20 +00:00
Marco Nelissen
ba5926ec3e NDK media codec sample 
Change-Id: Id7e70cfccdace8bce253bdac4434c42f52ff72f3
 2014-07-17 15:29:09 +08:00
Jesse Hall
22d95914d5 ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so 
Also update existing GLES2 and GLES3 headers to latest official
Khronos versions.

Bug: 15028495
Change-Id: Iecdc1d2cc23fbe10f225511536fb0bd46d11af4a
 2014-07-17 15:20:39 +08:00
Glenn Kasten
5c939bfd32 Update OpenSLES_Android.h for API L 
All other include/SLES/*.h are unchanged since API 14

Change-Id: If4be7449fc8866ee630dd7986d3ee0d6a48549d4
 2014-07-17 15:13:15 +08:00
Andrew Hsieh
37feee2abc Merge "Update mipsel and mips64el multilib lib* and lib-bootstrap" 2014-07-17 04:11:20 +00:00
Andrew Hsieh
d10a35fe44 Update mipsel and mips64el multilib lib* and lib-bootstrap 
Needed by:
  https://android-review.googlesource.com/#/c/101410
  https://android-review.googlesource.com/#/c/101022

Change-Id: Ia5f96fa2ee91984cba12983c9fb01a6b2e584209
 2014-07-17 16:24:51 +08:00